add more defaults
Merge branch 'master' of github.com:calvinwiebe/git-test into topic14
added a comment in test.coffee