Minor changes
Merge branch 'master' of https://github.com/vespene/vespene.github.io

Conflicts:
	_posts/2013-12-31-whats-jekyll.md