Updating for refactored parser/loaders.

Signed-off-by: Jared Woolston <jwoolston@tenkiv.com>
Merge branch 'master' into scenegraph