Merge skewl work branch into master

This will update all network coding in master, making it possible to continue with map work without as much trouble. *cough cough, WYATT!* This merge contains 2 midway commits and one final commit.