Merge pull request #6 from mitchellwills/develop

Initial implementation
travis cleanup