Merge pull request #189 from mfairchild365/merge_w_master

Merge w master
Merge pull request #190 from mfairchild365/channel-picker

Improve client validation of channel picker
Add a re-usable feed selector

This does a few things:
* Moves logic into PHP
* Combines current feeds with user-selectable feeds
Use the new feed selector
Render the file upload band in its own context
Remove now unused templates