Merge pull request #65 from wshafer/master

Final integration of Instance Configs into core
Added cloning to cms entities
Merge remote-tracking branch 'upstream/master'
Finished unit tests on entities