Merge branch 'master' of https://github.com/ChrisDavison/chrisdavison.github.com

Conflicts:
	_posts/2013-02-21-update.md
Merging differences