update feeds
Merge branch 'master' of github.com:Kapeli/feeds