Merge remote branch 'octopress/master' into source

Conflicts:
	.rvmrc
	Rakefile
	_config.yml