fixed merge conflict
updated whenever cron
Merge pull request #30 from bobolinks-2014/controller

Controller
enhancements and added loading sprites
did some controller updates and search ajax
updated guidebox parser with duplicate checker
cleaned up media migration
added method to clear incomplete records
updated omdb parser to handle netflix data
added netflix parser
updated rake task for seeding
removed rt parser
added model spec test
added another validation to parser
Merge pull request #31 from bobolinks-2014/ajax-frontend-calls

Ajax frontend calls
Merge pull request #32 from bobolinks-2014/netflix-parser

Netflix parser
preparing master merge
Merge branch 'master' of https://github.com/bobolinks-2014/browsin into ajax-frontend-calls

merging master with ajax branch
added spec tests for model fields
100% coverage on models