Update documentation
Merge branch 'master' of gitlab.marshall.edu:systems/zenoss-register
fixed rakefile
Merge branch 'master' of mugit03.marshall.edu:systems/zenoss-register