rm viewport testing cuz it's going in an iframe
Merge branch 'master' into gh-pages