Fixed alpha blending

Moved around the order things are drawn to fix blending to skybox. The
Skybox is now drawn first.
Merged with master

Master merged into texture borders branch, 2.0
Some minor things with merge