update from cordova 3.0.0 to 3.3.0
use ./scripts/set_up_new_machine.sh
setting git config if not defined
Merge branch 'master' into updateCordova
cordova cant run 3.3 without shelljs and q