Big ol cleanup
Merge branch 'master' of https://github.com/nickphillipps/nickphillipps.github.io

Conflicts:
	_includes/footer.html
	css/style.css