Removed cruft from setup.sh and feeds.conf
Merge pull request #70 from areynold/master

Looks good, shouldn't need testing.