Merge branch 'master' into server

Conflicts:
	src/stylus/blog.styl
Merge branch 'master' of georgenishimura.com:georgenishimura.com into server