Removed cruft from setup.sh and feeds.conf

Just removed commented items. Should not change build at all.

<!---
@huboard:{"order":27.5}
-->