Stuff

Signed-off-by: Mike Howe <mike@mcsnetworks.com>
Merge branch 'new-protocol' of https://github.com/Spoutcraft/SpoutcraftPlugin into new-protocol
Few fixes.

Signed-off-by: Mike Howe <mike@mcsnetworks.com>