Updated URL structure
Updated view & utils code
Updated templates & templatetags
Updated tests & fixed bugs and typos
Changes in response to review from @dpoirier
Merge pull request #608 from caktus/cleanup/urls_and_templates

refs #582 - Updated URL and template structure