Update for new data structures
Merge branch 'master' of https://github.com/thenitro/ngine