Remove all Skriv-specific URL-rewriting.
Merge remote-tracking branch 'origin/master'