regex wrong way round
Merge branch 'master' of https://github.com/untaken/untaken.org