Migrate to the one-true-way settings pattern
Merge branch 'master' of github.com:strycore/djung