ignore settings.local.yml file
Merge branch 'master' of github.com:anchor/machiavelli