Merge branch 'master' of github.com:spf13/hugo

Conflicts:
	hugolib/site.go

diff --cc hugolib/site.go
index 941a965bf1f0db808440bb6ee9dc02aa50890c39,6991806248c68fe7f19d755680b5204744ddf838..076e2a06a9bbf77551676ea9653bc9ac1e21d9da
--- 1/hugolib/site.go
--- 2/hugolib/site.go
+++ b/hugolib/site.go
@@@ -30,8 -30,10 +30,10 @@@ import 
  
  const slash = string(os.PathSeparator)
  
+ var DefaultTimer = nitro.Initalize()
+ 
  type Site struct {
-       c           Config
 -      Config           Config
++      Config      Config
        Pages       Pages
        Tmpl        *template.Template
        Indexes     IndexList
@@@ -198,15 -224,14 +224,15 @@@ func (s *Site) ProcessShortcodes() 
  }
  
  func (s *Site) AbsUrlify() {
-       baseWithoutTrailingSlash := strings.TrimRight(s.c.BaseUrl, "/")
++      baseWithoutTrailingSlash := strings.TrimRight(s.Config.BaseUrl, "/")
 +      baseWithSlash := baseWithoutTrailingSlash + "/"
        for i, _ := range s.Pages {
                content := string(s.Pages[i].Content)
 -              content = strings.Replace(content, " src=\"/", " src=\""+s.Config.BaseUrl+"/", -1)
 -              content = strings.Replace(content, " src='/", " src='"+s.Config.BaseUrl+"/", -1)
 -              content = strings.Replace(content, " href='/", " href='"+s.Config.BaseUrl+"/", -1)
 -              content = strings.Replace(content, " href=\"/", " href=\""+s.Config.BaseUrl+"/", -1)
 -              baseWithoutTrailingSlash := strings.TrimRight(s.Config.BaseUrl, "/")
 -              content = strings.Replace(content, baseWithoutTrailingSlash+"//", baseWithoutTrailingSlash+"/", -1)
 +              content = strings.Replace(content, " src=\"/", " src=\""+baseWithSlash, -1)
 +              content = strings.Replace(content, " src='/", " src='"+baseWithSlash, -1)
 +              content = strings.Replace(content, " href='/", " href='"+baseWithSlash, -1)
 +              content = strings.Replace(content, " href=\"/", " href=\""+baseWithSlash, -1)
 +              content = strings.Replace(content, baseWithoutTrailingSlash+"//", baseWithSlash, -1)
                s.Pages[i].Content = template.HTML(content)
        }
  }