Readme: fix comments that broke PyPI; update Travis image url
Merge branch 'master' into v0.4