UPdated SaltKeep loadRemoteData was missing
added dump parameter so keep.status
removed estate id (eid, device_id) from RaetKey keydata in file
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 pull request #14445 from cachedout/12098

Fix pillar overlay bug
Merge remote-tracking branch 'upstream/2014.7' into sam_2014.7
Merge pull request #14446 from SmithSamuelM/sam_2014.7

Updated SaltKeep Removed eid from RaetKey files since not one to one anymore