Merge pull request #26 from bwross/master

Batch of updates
Merge pull request #27 from bwross/master

Adding Travis CI badge to README.