Lots of changes, far from compiling.

Signed-off-by: Mike Howe <dockter@almuramc.com>
Merge branch '1.6' of https://github.com/Legacy/Spoutcraft into 1.6