Updates to twitter.py
Merge branch 'dev-master' of https://github.com/helenvholmes/barhack into dev-master