Twitter stuff actually working
Merge branch 'master' of github.com:rattrayalex/musical-toilet