Merge pull request #18 from aspiers/master

Travis: also test with Python 2.6
remove superfluous blank line