Merge pull request #1 from conversocial/dev

Bring dev up to date with master, add error parsing
tweepy fix for twitter 1.1. api