start of import, got basic test working, feedjira updated
merge rss
fix merge, oops
rss import working