Merge pull request #89 from RobertWalsh/master

Updating project to work with Travis CI.