Move to opaque JSON protocol, add multiplayer
Partial stuff
Merge branch 'master' into robbie
Merge branch 'master' into robbie
Added multiple config file support