Merge pull request #792 from wiredfool/2.5.x

Release 2.5.1
Bump [ci skip]
Skip Known Bad Tests
Known Bad tests -- skipping jpeg2k tests on travis on OSX