fix whitespace
remove auto, rename sp
fix whitespace in main
fix voxelmesh indentation
shader {
Merge branch 'master' of https://github.com/voxelinc/voxellancer into switch_voxelcluster_to_vaos

Conflicts:
	src/game.h
fix merge error
Merge pull request #265 from voxelinc/switch_voxelcluster_to_vaos

Switch voxelcluster to vaos
Merge branch 'master' into engine_trails

Conflicts:
	data/particle.vert
	data/voxelcluster.vert
	src/worldobject/ship.cpp
	src/worldobject/ship.h
	src/worldobject/weapons/rocket.h