Merge pull request #11 from stevengill/master

 CB-13055: fixed failing tests in cordova-lib