Improve handling of uniforms

Also, make the basic shaders more basic
Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>

Added OpenGL20 support
Signed-off-by:thehutch <th3hutch@yahoo.co.uk>

Further OpenGL support progress
Signed-off-by:thehutch <th3hutch@yahoo.co.uk>

Finish OpenGL20 support

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>

Removed redundant RenderMode
- Added beginning of Texture
Signed-off-by:thehutch <th3hutch@yahoo.co.uk>

Completed texture support
Signed-off-by:thehutch <th3hutch@yahoo.co.uk>

Added Texture Javadocs
Signed-off-by:thehutch <th3hutch@yahoo.co.uk>

Removed redundant RenderMode
- Added beginning of Texture
Signed-off-by:thehutch <th3hutch@yahoo.co.uk>

Completed texture support
Signed-off-by:thehutch <th3hutch@yahoo.co.uk>

Fixed more git errors
Signed-off-by:thehutch <th3hutch@yahoo.co.uk>

more git errors
Merge branch 'master' of github.com:thehutch/Caustic

Conflicts:
	src/main/java/org/spout/renderer/Texture.java
	src/main/java/org/spout/renderer/gl20/OpenGL20Texture.java