Temp Save
Initial clean up of service managers
Disabled tests.  Will be fixed in a later PR.
Legacy adaptor for the user map.
Added Save Methods and minor code cleanup.
Merge pull request #85 from wshafer/master

Initial clean up of service managers