[Bug 741604] use names rather than numbers for external account types
[Fix Bug 741604] Add multi-website support
[fix bug 938491] Add *.wp.com in CSP_IMG_SRC.
Merge pull request #681 from Sancus/741604-multi-websites

[Fix Bug 741604] Add multi-website support
Merge pull request #719 from glogiotatidis/csp

[fix bug 938491] Add *.wp.com in CSP_IMG_SRC.
[Bug 741604] fix dict comprehension syntax in migration for python 2.6