Merge branch 'master' of github.com:JerrySievert/Terraformer
Merge branch 'master' of github.com:JerrySievert/Terraformer
Merge remote-tracking branch 'upstream/master'
minor code cleanups
Merge pull request #43 from JerrySievert/master

some small code cleanups