Intermediate stage so I can pull from master
Added feed migration and prepared for twitter
Merge