initial configuration
Merge branch 'master' of github.com:paulgb/settings
merge