Merge branch 'upstream/master'

Conflicts:
	app/views/users/show.html.erb
Comment cleanup
Cleanup to match
Updated following text
More cleanup
Merge pull request #3 from paul-christmann/master

Big merge
Move messages to a tab
Merge pull request #4 from paul-christmann/master

Move messages to a tab
Merge branch 'master' of github.com:davidrhoden/rnrmatchbook

Conflicts:
	app/views/users/show.html.erb
Merge branch 'master' into design130808

Conflicts:
	app/views/posts/_post.html.erb
	app/views/shared/_likestats.html.erb
	app/views/shared/_stats.html.erb
	app/views/shared/_user_info.html.erb
	app/views/users/mailbox.html.erb
	app/views/users/show.html.erb