Merge pull request #48 from tf198/develop

Development environment for salt-contrib
Merge branch 'master' into traffic-shaping