* Finish merge of Kurt Rinnert renderer code
* Fix build