Fixed typo in docstring
Remove Python 2.5 from .travis.yml.

Travis CI no longer supports Python 2.5.  Thanks to @dmorrison42
for pointing this out.  Removing 2.5 from the Travis config should
make the Travis build status image work again.
Merge pull request #161 from pombredanne/patch-1

Fixed typo in docstring
Merge branch 'master' into development