Fixed one error, got another

Moved cordova.js to /js folder so that phonegap loads the current
version instead of the local file.  Also changed around the camera
plugin in xcode to no avail.