First pass
Fix busted test.
[CB-4877]: Add basic logging, --silent flag.
Fix cli.js tests broken by --silent change.
Bumping elementtree version to 0.1.5 to match plugman and support namespaced xml elements
Fixes a bug where cordova prepare bombs on a config missing a content
element
  - Changes an undefined check to falsey to cover random null value
    returned from elementtree

  Tested By: David Kemp <drkemp@google.com> via Medic
[CB-4774] Display proper error if cordova prepare run not in project dir.

cordova prepare fails with a cryptic error message if run not from
cordova project dir:
  TypeError: Arguments to path.join must be strings
Fixed it to display the usual:
  Error: Current working directory is not a Cordova-based project.
Update "cordova serve" to work with promises refactoring
Make cordova serve ignore dot files.
Log requests in cordova serve
[CB-4621] Updating run and emulate commands to always provide default options
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
begin firefoxos tests
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