small fixes
merge branch 'retweeting' of github.com:wvmitchell/SocialSmarts into retweeting
Fixed feature tests