clean up focusing, only use fly controls on #scape
Merge branch 'master' into gh-pages