Merge branch 'master' of github.com:JerrySievert/Terraformer
add node_modules for travis-ci