Better association naming
Merge pull request #1 from michellebonat/update-db

Adding through relationship to Wiki and User models
Merge 'create-public-wiki'
Merge branch 'master' into more-features

Conflicts:
	app/controllers/wikis_controller.rb
	app/models/user.rb
	app/models/wiki.rb
	app/views/wikis/_form.html.haml
	app/views/wikis/index.html.haml
	app/views/wikis/show.html.haml
	app/views/wikis/update.html.haml
	config/routes.rb