add firefox platform
change firefoxos link to tarball
make the firefoxos parser actually build the project
add default manifest properties for firefox os platform
Merge branch 'master' of github.com:jlongster/cordova-cli into ffos
CB-4657: added staging_dir function to ff parser
CB:4657 added ffos support to cli
[CB-4793] Lazily require modules in some places.

With the related change to plugman:
cordova plugin ls: 700ms -> 80ms
cordova create: 800ms -> 450ms
[CB-4797] Change `serve` command to serve platforms keyed off of path component.

E.g. /ios/www will have iOS's www
Fix broken tests due to lazy requiring change.
[CB-4797] Add missing return statement in cordova serve
[CB-4797] Fix a crash on undefined platform in path.
fixed merge conflicts in package.json
[CB-4774] Updated prepare flow to make platform config.xml a build
output