cleanup settings
Merge pull request #46 from andymckay/cleanup

cleanup settings