Refactor settings module.
Merge pull request #3 from mattdeboard/settings-refactor

Refactor settings module setup