Updated .travis.yml
Updated README.md
Merge pull request #17 from disconsented/Refactor

Refactor