Tweak error wording

**Note: this pull is for 2014.1 and includes cherrypicked wording fixes**

These commits fix some issues with how we are wording our error messages, and also make the use of the term ``saltenv`` more visible in them.