Merge pull request #109 from seajosh/master

Fix for broken tests
added python 3 to Travis CI