Android needs Cordova min of 4.0
Rev version
Taking cordova build instructions out (they don't work)
Merge pull request #775 from khawkins/update_min_version

Fixing a few npm package issues
Merge remote-tracking branch 'upstream/master' into unstable_merge

Conflicts:
	node/forcedroid.js
	package.json
Merge pull request #776 from khawkins/unstable_merge

Merging master back to unstable