Parallel/interlinear(ish) views.
Merge branch 'master' into browser
Merge branch 'browser' into gh-pages