Merge branch 'tweet-timeline' of github.com:steveclancy/legit

Conflicts:
	app/views/watchers/show.html.erb
Merge branch 'master' of github.com:steveclancy/legit

Conflicts:
	app/views/watchers/show.html.erb
Filter commented out, stuff