Changes to be python 2.x compatible
Added travis test for python 2.6/2.7