Pagination and active pick
Merge branch 'master' of github.com:steveclancy/legit into tweet-timeline

Conflicts:
	app/views/watchers/show.html.erb
Fixed to work with new code
Merge branch 'master' of github.com:steveclancy/legit into tweet-timeline

Conflicts:
	app/views/watchers/show.html.erb
Merge pull request #9 from steveclancy/tweet-timeline

Tweet timeline