refactoring, only one instance of settings
Merge branch 'master' of github.com:daniel-e/papershelf