Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
update config variables
decouple relpaths from cwd
Merge branch 'master' into dev
begin skim/grok/master scheme