updated to latest rustc
Merge pull request #48 from csherratt/fix_libc

updated to latest rustc
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/gen/main.rs
	src/gl/gl21.rs
	src/gl/gl30.rs
	src/gl/gl31.rs
	src/gl/gl33.rs