popularity added to Instagram
popularity merge conflicts
Merge branch 'master' into popularity
      when (400..499)

Conflicts:
	app/views/news_items/index.html.erb
	log/development.log
Tumblr refactor and News Item object
merge conflicts
Tumblr and Instagram into NewsItems, sorted by popularity
Merge branch 'master' into popularity