Configuration and install changes.
Merge branch 'master' of github.com:randalburns/ocpcatmaid