Python 2.7 fixes
Merge pull request #1 from rail/eb

Python 2.7 fixes