Merge remote-tracking branch 'upstream/master' into develop
Adding fedoraremi (Fedora Remix) to _OS_NAME_MAP
Fedora Remix shows the cpu flags as Features
Add force_reload for debian_service, upstart and systemd and use it as default in mod_watch if available
Add template arg to cmd.run* and archive.*
Add a pilla rlist to test advanced pillar matching
Add tests for pillar matching list objects Fix #2761
Fix issue where extra cron entries were placed in empty crontab
Fix #2815 there was a type problem with the data yaml was sending
double check rpm output to have the _|- per #2884
Fixes #2811 virtualenv.manage test=True

test=True didn't agree with reality
Merge pull request #2886 from UtahDave/develop

Fixes #2811 virtualenv.manage test=True
clean up some double quotes
Add multiple package sources to pkg state

Also, cleaned up some bugs in modules/pkg_resource.py
Merge pull request #2887 from archtaku/develop

Add multiple package sources to pkg state
makes it so rvm works. Actually set default ruby
Merge pull request #2888 from UtahDave/develop

makes it so rvm works. Actually set default ruby
Undo my changes in 747ee9 because of the changes in bc77261

See discussion and comments on 747ee9 for more info.
Merge pull request #2889 from fatbox/rpm-faster-version

Undo my changes in 747ee9 because of the changes in bc77261
Fixing available_version for freebsdpkg and copying it to pkgng