cleaning up controls for renderer selection
Merge branch 'master' into gh-pages