Fixes for 1.7 and python 3 in travis.