Merge pull request #189 from gregburton/master

Code cleanup to JS, CSS, controllers, helpers, models
code cleanup of discovers views