Small changes
Merge branch 'cordova-hcp' of github.com:meteor/meteor into cordova-hcp