bumped maestrano gem version
refactored
Merge branch 'master' of github.com:maestrano/maestrano-rails

Conflicts:
	Gemfile.lock