Merged Skybox stuff in

yea, that other branch is pretty fucked :)