Merge branch 'gh-pages'

Conflicts:
	_site/about/index.html
	_site/index.html
	_site/leadership/2014/01/06/thoughts-on-leadership/index.html
	_site/mongodb/2014/01/06/mongodb-legacy-migration/index.html