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