message_user to message_recipient because it is more clear what this join table is about (less confusing)
Merge branch 'master' of github.com:elle/discuss

* 'master' of github.com:elle/discuss:
  Removing specific markup that doesnt belong in applicaions layout.
  Adjusting routes to ensure normal message resource does not interfere with the mailbox/inbox actions.
  Converting application.html.erb into haml
  Small changes to create form
  Allowing strong paramters to accept recipient_ids
  Subclassing from _their_ application controller to allow them to override #current_user with ease
  Adding routes under a discuss namespace
  Update README.md
  Adding migrations into the gem itself so that rails will detect this as a true _engine_ and allow for the rake task to copy migrations into peoples projects
  Adjusting routes so that compose route (messages#new) supersedes the catchall of messages/:type
  Mocking current user in the test to prevent them from failing.
  Adding some gems for testing