fix extraction of avatar URLs from bitbucket API responses
Merge pull request #2324 from gittip/bitbucket-avatars

Fix bitbucket avatars
Bump version to 12.9.4
Bump version to 12.9.4-dev
Add a FAQ item about canceling one's account
Add a couple comments to deactivate-final-rename
Rename deactivate-final-rename to cancel

Fits my brain better. Anyone else?
Merge pull request #2369 from gittip/cancel-faq

Add a FAQ item about canceling one's account
Actually, rename cancel to deactivate

Let's say that "deactivate" is a step in the "cancel" process.
Bump version to 12.9.5
Bump version to 12.9.5-dev
Merge pull request #2370 from gittip/cancel-tweaks

Cancel tweaks
only show actually connected accounts. Resolves #2194
Update payday.sh's test mode

To keep up with changes to dev env.
Merge pull request #2375 from gittip/fix-payday-test-mode

Update payday.sh's test mode
Merge pull request #2363 from ivanmushketyk/nonexisting-accounts

Only show actually connected accounts
Bump version to 12.9.6
Bump version to 12.9.6-dev
Merge branch 'master' into add-venmo-button

Conflicts:
	templates/connected-accounts.html