Dont assume we want to run on device just because one is connected - this has bitten me for several demos now
Merge remote-tracking branch 'calabash/0.9.x' into rpr

Conflicts:
	calabash-cucumber/lib/calabash-cucumber/version.rb
Merge pull request #4 from moneytree/rpr

Updated the version from the main repo and prepare for pull request to the main repo