Merge pull request #398 from hilburn/1.7-update

CC Beautification
Merge pull request #401 from hilburn/1.7-update

Turtles Complete
fixes build and readded null check
Merge pull request #400 from way2muchnoise/1.7-update

fixes build and readded null check
Merge pull request #402 from hilburn/1.7-update

Fixes load without CC
fixes some rendering issues

journal still needs some lighting fixes
Merge pull request #404 from way2muchnoise/1.7-update

fixes some rendering issues
Merge pull request #403 from hilburn/1.7-update

Less hacky