Make terraform-dir a CLI option
Merge branch 'master' of github.com:bandwidthcom/genesis