move to rspec 3
Merge pull request #1117 from stamm/master

Move to rspec 3
Update .travis.yml
made ruby version requirement explicit
added newline after question with noecho
Merge pull request #1119 from kaikuchn/master

explicitly require ruby >= 1.9.3, added newline after question with noecho
Fix typo in default deploy_to comment
Merge pull request #1121 from mattbrictson/patch-2

Fix typo in default deploy_to comment
Update .travis.yml

Stop travis running a build for the legacy-v2 branch.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	CHANGELOG.md