Merge pull request #24 from s0undt3ch/features/travis-ci

Travis is only triggering on the develop branch.
Merge branch 'develop' of github.com:saltstack/salt-bootstrap into features/travis-ci