boilerplate settings
Merge branch 'master' of github.com:andypiper/marvellous