FactoryGirl vs. Factory for compatibility with different ruby versions
Fixes to update the content.
Shared partial to update
flash effects for following/unfollowing
Some wall styling.
More style tweeking
More stuff for sending private messages.  UI is workable, now need to get the model ready
Removed stray border
Adding tests for messages
User inbox
Message controller testing
Full redirects
Outbox
Working private messages
Merge branch 'upstream/master'

Conflicts:
	app/assets/stylesheets/custom.css
	app/views/pages/home.html.erb
	app/views/shared/_likestats.html.erb
	app/views/shared/_stats.html.erb
	app/views/users/show.html.erb
	config/routes.rb
	db/schema.rb
	public/stylesheets/blueprint/screen.css
Merging
conditionals in migrates
Syntax error fixes
user_info is a partial taking user as input
Testing cleanup