Django 1.7 changes for our auto tweeting script
Merge remote-tracking branch 'upstream/master' into mar-lookup-retry