Adding through relationship to Wiki and User models
Better association naming
Merge pull request #1 from michellebonat/update-db

Adding through relationship to Wiki and User models