removed 3.x support from travis, flake8-ed files, minor tweaks to code