Time to open this can again apparently.  Thanks Broodlin.....

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