Another try at PyPI through Travis CI.

So... git flow tags the develop branch and Travis has some peculiar
problems when it comes to triggering publishing based on tags
(re: https://github.com/travis-ci/travis-ci/issues/1675).  I'm
just going to publish anything that gets merged into master and
be done with it.
Merge branch 'develop'

Pulling in Travis CI changes.