set up root settings file to be more intuitively customizable
Merge branch 'master' into gh-pages