Merge pull request #45 from asottile/py36

Test against python3.6