Remove wk2.zip, minor code cleanup
Merge branch 'master' of https://github.com/timiscoding/phonegap