Remove python3.4 travis fixups (it's preinstalled now)
Merge remote-tracking branch 'upstream/master'