Allow the VT tests to run on OSX
Factor out into a function the current number of PTY's detection code
UPdated SaltKeep loadRemoteData was missing
added dump parameter so keep.status
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.
Merge pull request #14441 from thatch45/develop

Merge up Augeas fixes
begin ansible roster
should be a dictionary not a list
Use loader instead of variables
clean up matching
implement children nodegroups
removed estate id (eid, device_id) from RaetKey keydata in file
Merge pull request #14389 from s0undt3ch/hotfix/osx-pyt-nr

Allow the VT tests to run on OSX
Skip vt_test in os x - still needs some work to run
Merge pull request #14442 from rallytime/skip_vt_test

Skip vt_test in os x - still needs some work to run
Fix pillar overlay bug
Merge branch '2014.7' into develop
add executable ansible hosts files
Merge pull request #14445 from cachedout/12098

Fix pillar overlay bug
Merge remote-tracking branch 'upstream/2014.7' into sam_2014.7