Merge pull request #5 from erik-johnson/develop

Develop
Updated configuration for Dell copyrights
Changed copyrights to reflect Dell acquisition of Enstratius
Merge pull request #6 from greese/develop

Develop