API v2 - switching two /blah/ regexs to %r{blah}