weekend changes
Rename model attributes to match feedzirra's methods
fixed feed show view conflict
Ensure entries have a feed_id
Fix conflicts
feeds/index conflict resolved