Added website prefix fix to regular team parser (oops!)
Added test case
Merge branch 'master' into url_fix