Merge pull request #85 from jlsherrill/content-views

merge master into content-views
adapting environment commands to new structure

seen in https://github.com/Katello/katello/pull/3754