Changed almost all of the hardcoded urls to the reverse match function thing
Merge branch 'master' into testing