prep for merge
Merge branch 'master' of github.com:anviljs/anvil.scaffold.cli
Merging in @eliperelman's fix and bumping version