finally managed to get Twitter 3-legged auth working.
Merge remote-tracking branch 'origin/master'