Merge pull request #7 from d0/master

Add a basic .travis.yml file for automated testing
Merge remote-tracking branch 'upstream/master'