Updated to latest upstream release. Fixes Twitter to use API 1.1, since API 1.0 is no longer supported
Merge branch 'dutch-pistachitos' into dutch-tpb