Add version of Master to manage.versions output.
Backport #14422 to 2014.7
Merge branch '2014.7' into develop

Conflicts:
	salt/runners/manage.py
Add logger back into schedule.py
Fix indexing pylint errors in localemod.py
fix rbenv module UnboundLocalError
Backport #14428 to 2014.7
Merge branch '2014.7' into develop
Fixing a weird case where an empty job file will end up in the cachedir, causing exceptions when the minion is restarted.  This change removed the problem job file.
Backport #14439 to 2014.7
Merge branch '2014.7' into develop
begin ansible roster
should be a dictionary not a list
Use loader instead of variables
clean up matching
implement children nodegroups
add executable ansible hosts files
use targets like flat.py
document functions for ansible roster
clean up and add some minor logging

make --roster-file work with the ansible roster