fix package.json from bad hand merge
Merge branch 'master' of github.com:JerrySievert/Terraformer
Merge branch 'master' of github.com:Esri/Terraformer