Renamed a bunch of stuff. Removed "Template" suffix from templates.
Renamed comp -> competition and comps -> competitions wherever
appropriate.