3.2.0 More code drift!

Merge pull request #63 from JimTheCactus/dev

Merge dev to master to create release 3.2.0

2.9.11 Stable

Last revision before the database switchover. From here out we're steaming headlong into 3.0