user can delete channel from users show and from channel show
Merge pull request #20 from mule-deer-2013/monday_code_review

Monday code review
Merge branch 'master' into user_delete_channel

Conflicts:
	app/assets/javascripts/application.js
	dump.rdb
Merge branch 'channel_learns_preferences_from_browser' of https://github.com/mule-deer-2013/NewsShark into channel_learns_preferences_from_browser

Conflicts:
	app/views/channels/show.html.erb
controller tests for ArticlesController#update.