rake install
rake install
Merge branch 'source' into oldmaster

Conflicts:
	Gemfile.lock
	Rakefile
	_config.yml