removed carrot link
Merge branch 'master' into ajax_tweets