Why are we breaking existing functionality? What is it about not being able to use ``--environment`` flag that's so awful that we now need to either use an ENC and modify Puppet configuration on the master? Why, again, are we breaking the flow of being able to quickly and easily test changes by putting them in their own branch/environment and kicking of an `puppet agent --environment`` run?