Starting to add some config options
merge conflicts
Merge branch 'master' of github.com:leon13/scotch
fixing autoloading issues