Merge pull request #6336 from terminalmage/quickfix

bsd_shadow: add note on escaping dollar signs
Use proper escapes for Travis' sanity
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.