Clean up of spout render code

Removed lots of unused code
- Converts to JDK 7 diamond operators
- Removal of GL11 checks (@kitskub said that GL11 has been removed)
- Formatting