delete obsolete join tables
rename remaining misnamed controllers
Merge pull request #9 from dalexj/renaming

Renaming