Merge pull request #2219 from kitskub/meshes

merge client-connection into meshes
Clean up of render stuff

Signed-off-by: Jack Huey kitskub@gmail.com