renamed settings to _settings so file would not compile
Merge branch 'master' of github.com:slowbot/thisislandscape-pattern-library
Merging with master branch