blah
Revert "blah"

This reverts commit d74315a71e2504aba54c99ec81df998e760712c7.
Revert "Fixed commit goof ups but now skybox broken :("

This reverts commit 692b1d7319096f69dc45033de492522deb83cd1c.
Revert "test merge"

This reverts commit 587ae103c5d9a31614f9c2c1c05b56a77f1a2e28.
blah
blah
Fixing merge