Readded default config
Merge branch 'develop' of https://github.com/tpott/butter-star into develop