Merge branch 'master' of github.com:udoprog/c10t

Added zooming controls by default

Fixed stupid deadlock

Fixed missing colors

Updated to specifically set version

Refactored main rendering to only submit a specific amount of jobs to

prevent slow compositioning from racing away in memory