added jFeed, redeleted things
Merge branch 'master' of https://github.com/lashimmer/strippr