Merge pull request #318 from s0undt3ch/stable

Merge Stable for v2014.02.18
Merge branch 'stable' of github.com:s0undt3ch/salt-bootstrap into stable
Merge pull request #319 from s0undt3ch/stable

Merge Stable for v2014.02.18
Merge branch 'stable' of github.com:saltstack/salt-bootstrap into stable
Removed too much in 3c9d1cd05a8074cbbbfba9a5cb63a27a346ed475
Update changes log