wrong version
It should read 0.10.6 since it was not included in the 0.10.5 release. Thanks @seanchannel.
Return to calling peer if runner execution fails
Merge pull request #2799 from s0undt3ch/hotfix/gdb-resources

Finally fix the python 2.6 issues.
PKGBUILD-git updated:
reflect changes from commit 0d77329
- conf/master.template -> conf/master
- conf/minion.template -> conf/minion
- updated PKGBUILD to add systemd service files
Merge branch 'develop' (this includes the 0.10.5 release)
Merge pull request #2800 from UtahDave/fix_2795_peer_runner

Return to calling peer if runner execution fails
Adding fedoraremi (Fedora Remix) to _OS_NAME_MAP
Fedora Remix shows the cpu flags as Features
remove extension before comparing to pkg_list()

pkg_list() doesn't have the arch appended to the end.
* fix: ssh.set_known_host() did not evaluate hash_hostname argument
* use argument hash_hostname in ssh_known_hosts.present state
fix indentation as these comment are at module level and not function level
remove dead code
Merge branch 'develop' into small-fixes

Conflicts:
	salt/minion.py
	salt/modules/freebsdpkg.py
	salt/payload.py
Merge pull request #2801 from aboe76/archlinux_update

PKGBUILD-git updated: reflect changes from commit 0d77329
Fix output deprecation messages logic. Refs #2807.
Cleanup getting the colored output logic.
Merge branch 'develop' of github.com:saltstack/salt into issues/2807
Properly catch `KeyboardInterrupt`'s like we used to.
Merge branch 'develop' of github.com:saltstack/salt into issues/2807