Fixed settings to work in the new location.
Merge branch 'master' of github.com:rcythr/Obsessive
Moved some stuff around.
Merge