Merge pull request #495 from snoack/py35

Added Python 3.5 to tox and Travis configuration