Merge settings and allow local settings.

Fixes #11. Fixes #32.
Merge pull request #56 from cantsin/master

Merge settings and allow local settings.