More object tree shit.
Merge branch 'master' of github.com:OpenBYOND/OpenBYOND