Added URL rewriting for prettier URLs

Should have fixed the auto-merge failure, sorry about that.