Release 2.5.1

I'll squash this later, just working here to get Travis builds etc working