2014 10 13 cordova 4

Please squish.

I've left things as distinct commits in case someone races my PR.