formatting
Merge branch 'rpi' of github.com:tangrams/tangram-es into rpi

Conflicts:
	core/src/gl.h