rework and cleanup
Merge branch 'master' of https://github.com/wfalkwallace/gavel