gh-pages commit only?
Merge branch 'master' into gh-pages

Conflicts:
	Gruntfile.js
	dist/index.html
	dist/sitemap.xml
	package.json
	src/posts/2014-02-15_An_intro_to_markdown.md
	src/posts/2014-02-17_Lorem_Ipsum_Dolor_sit_amet.md