Merge Develop

It seems to be me, Douggie, and Austin at the moment, so it's probably easier to just have the master branch.