Integrating changes between repos. Still working on it.
For the most part, LongFrontier stuff seems to be working.
Changes between Geoffs and Olivers repos seems to be well intergrated now.