CB-5032: clarify the help text
[CB-4774] Updated prepare flow to make platform config.xml a build
output
  - Adds a new method to manually merge two config.xml files
CB-4957: added fix for FFOS
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-cli
added temp config path for ffos, fixed wp8 config_xml function
added myself as a contributor, CB-5042 added info on windows8
added not about platform+os restrictions
CB-5067: added exception incase no platform level config.xml or defaults.xml exisit

Also updated cli to use 3.1.0 instead of 3.1.0-rc1
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-cli
updated to a version greater than our latest version on npm
cordova help should return a Q. fixes CB-5070
CB-4774: Copy www assets before running plugin prepare
CB-2234 Add 'cordova info' command
Update tests for commit d1c8024: update_project() should not call update_www() directly