Cleaned up, need to upgrade phonegap from 2.0 to 2.7.0