blah
Merge branch 'master' of https://github.com/SIBClusters/ClusterDuck

Conflicts:
	app/views/feeds/index.html.erb
still working on this twitter update
Twitter status list works and submits to db
Merge branch 'TwitterStatus'