Merge pull request #6337 from UtahDave/develop

Use proper escapes for Travis' sanity
pip: Make runas and user work interchangeably

The pip state uses "user", while the module uses "runas".  This needs to
be unified in 0.17.0, but until then this commit makes these arguments
interchangeable.
Add proper deprecation warning for runas arg in pip module

Also remove the ability to use runas interchangeably in the state. If
we're going to deprecate it, no need to let people get used to using
runas in their states.
use salt.utils.warn_until for deprecation warning
remove unnecessary **kwargs
Merge pull request #6339 from terminalmage/quickfix

pip: deprecate runas param
Change runas to user for pip module tests
Merge pull request #6341 from terminalmage/travis

Change runas to user for pip module tests
Fix indentation in the minion config template

The example for the 'backup' param in the minion config file template is
indented one level further than it should. This commit fixes that.
Merge pull request #6342 from terminalmage/quickfix

Fix indentation in the minion config template
Document how the pillar namespace is flattened.
Alaways show triggered deprecation warnings on the unit test.
Test the deprecated `runas` argument to `salt.modules.pip`.
Trivial doc spelling fix

It is trivial but it is my first commit / pull request so useful for
checking the process is correct. And it has a semicolon
`user` and `runas` now raise an exception. "There can be only one".

* Always show the deprecation message `runas` is not `None`.
* If both `user` and `runas` are used, that's an error! Full Stop!
* If `runas` is being used and `user` is not, adapt the code and don't fail.
Merge pull request #6343 from go8ose/note-pillar-flat

Document how the pillar namespace is flattened.
Merge pull request #6344 from mikadosoftware/minor-doc-fix

Trivial doc spelling fix
Also deprecate `runas` on `salt.states.pip`.

* Added mock tests to check if the deprecation is triggered, and to see if the deprecation is also returned to the user in a warnings key.
Added test case to see if the usage of `user` and `runas` at the same time raises an exception.
Simplify `__virtual__` logic.