Fixing missing trailing slash in baseUrl
Merge branch 'master' of github.com:spf13/hugo

Conflicts:
	hugolib/site.go