Adding more config options
Merge branch 'master' of https://github.com/robottaway/warmachine