Merge pull request #566 from kitskub/client-connection

Rebase client-connection on master
Cleanup of render stuff

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