Revert c277522..a926791

This rolls back to commit c2775227dad401f7d6646b9f94d70e97f55c8814.
Revert "Revert c277522..a926791"

This reverts commit eb08d0ca8a49bdc1fb29d0f8380b9a8f65463014.
Merge branch 'master' of https://github.com/gwpy/dataviewer