Now installing salt v2014.7.0rc7
Updated bootstrap-salt.sh to fix bugs
Fix for v2014.7.0rc7
Merge branch 'develop'