Merge pull request #182 from tfhartmann/master

Python 2.6 added to travis
Re-enable unit test broken by #167's bug
Merge pull request #183 from huit/enhancement/reenable_167_test

Re-enable unit test broken by #167's bug