new "include" directive in conf files
Merge branch 'master' of github.com:ticklemynausea/mbot