Mostly coding style improvements
Merge branch 'stable' of github.com:joshuaspence/pear.joshuaspence.com into stable

Conflicts:
	conf/etc/nginx/sites-available/pear.joshuaspence.com
	static/404.html
Minor fixes
Merge branch 'stable' of github.com:joshuaspence/pear.joshuaspence.com into stable