various
Merge branch 'master' of https://github.com/wchapman/wchapman.github.io

Conflicts:
	_posts/2014-05-15-second.md