Add Bambuser and Ustream
Merge
Added 11 sites from email submissions
Merge remote-tracking branch 'upstream/master'