router re-write
Merge branch 'master' of https://github.com/kevadsett/Campaignr
controllers re-name