Merge remote-tracking branch 'origin/master'

Conflicts:
	_posts/2013-03-01-Beluga-Analysis-on-Hadoop.md
Merge remote-tracking branch 'origin/master'