Merge pull request #25 from graingert/patch-2

Add Python 3.5 to travis