updated documentation to account for local settings
merge conflict
lists back to unordered
spelling
Merge pull request #10 from jnettik/iss-8--local-settings

Iss 8  local settings
close #8