3.0.0

This has the Fife Ventures extra bits and the occasional bug fix. These have also been put into the 3.1 branch for consistency.