CB-3612 Don't pass --device to "run" command by default. Update help text
Fix serve command when config.xml is in the root (not within www/)
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-cli