sanitize keywords
remove redundant partial from user show
Merge branch 'sanitizing_coming_keywords' of https://github.com/mule-deer-2013/NewsShark into sanitizing_coming_keywords

Conflicts:
	db/schema.rb
revert to functional keyword scraper
Merge branch 'master' of https://github.com/mule-deer-2013/NewsShark

Conflicts:
	app/assets/stylesheets/application.css
Merge branch 'master' into sanitizing_coming_keywords
keywords without ', ' are properly parsed
Merge pull request #12 from mule-deer-2013/sanitizing_coming_keywords

Sanitizing coming keywords