Merge pull request #31 from eaburns/dev/eaburns

Store feeds in the datastore and more