Merge pull request #142 from erran/master

Prepare 2.6.0 release
Move @erran up in the list of contributors
Prepare 2.6.0 release