Initial work for an improved compositor
Integrate the improved compositor
Merge pull request #5 from infinityb/master

Initial work for an improved compositor