A little more cleanup on #424 and also starting on the Contact replacement now that all of the User references are done.
Merge branch 'master' of https://github.com/samilliken/openDCIM