Merge pull request #71 from michaelsanford/master

Meta viewport, CanvasRenderer