a couple more user config options
Merge branch 'master' of github.com:flyingmachine/rabble