Small corrections
Merge pull request #1 from thegcat/patch-1

Small corrections
Merge branch 'master' into staging

Conflicts:
	source/blog/2013-08-29-exhaustion.html.markdown
Software upgrade, yeah!