Feature/now 550

Feel free to review this now. I'm using the pull request to actually trigger a travis build to test my configurations to the travis.yml file. I got some vagrant/chef stuff in this branch, feel free to disregard.