added static config
added more config options
updated config loading
whitespace fixes
Merge branch 'master' into 0.0.x-dev