Progress commit
Merge branch 'june-wip' of https://github.com/JedWatson/sydjs-site into june-wip

Conflicts:
	public/styles/site.min.css
	templates/layouts/default.jade