refactored search and user controllers for speed
refactored user and media models for speed
created user preference model and migration
fixed merge conflicts
removed merge confclits
updated models for new table
updated merge conflict
Merge pull request #46 from bobolinks-2014/controller

Controller