parameterize confdir
Merge remote branch 'upstream/master' into parameterize_confdir
Merge pull request #47 from bappelt/parameterize_confdir

parameterize confdir