deploy
Merge branch 'source'

Conflicts:
	Rakefile
	_config.yml