updated path in step 9
Merge remote-tracking branch 'origin/master'

* origin/master:
  Ensure salt keys & minion file are generated correctly
  Add hip chat notifications
  Update deployment config
  Add build badge to readme
  Make tests py2.6 compatible
  Add travis specific config that uses the correct interface
  Stop using deprecated .defaults module for url patterns
  Adding ifconfig to before_script so we can fix a test error
  Refactor tests
  Add YAML as a requirement
  Set correct requirements file
  Adding Travis CI config