Missed the fix Ben made to this on the merge, so changing it.
Editor work
merged peter -> ben
fixed game project config

fixed compile errors, cleaned stuff up.
Editor loading fixed
Merge ben into this branch
Quick fix things