Merge pull request #1 from oscurrency/master

Pulls in test fixes plus some other small changes
Adds travis yml
Merge pull request #580 from oscurrencyVRL/travis

Travis