Merge remote-tracking branch 'origin/master'

Conflicts:
	_posts/2014-06-01-references.markdown