minor fixes and config changes for final release 1.2
Merge pull request #3 from tim-savage/develop

minor fixes and config changes for final release 1.2