Merge branch 'refs/heads/master' into mail
Merge branch 'refs/heads/mail'
Facebook login
Merge branch 'refs/heads/facebook'
README formatting
notification for new messages and rake task for same
hide error notification in messages form

for some reason, something is validating the message before it gets to this point - weird.  But I think harmless, so just hide the notification.
Merge branch 'refs/heads/braintree_store'