Merge pull request #735 from bhariharan/unstable

Upgrading to Cordova 3.6.4, which is the latest 3.6.x
Adding a TODO