docs
Merge branch 'master' into capistrano-provider

Conflicts:
	README.md