better logging
Merge branch 'master' into prod

Conflicts:
	site.go