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.