py26 and travis fixes
Merge branch 'master' into test
travis fix