added activity modifications
Merge branch 'master' of heroku.com:softlife
wip twitter follower count
 added the payload for activity
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
Merge branch 'master' of heroku.com:softlife