some refining of video search
Merge branch 'master' of github.com:weareytm/Ragnarok
Potential fix for 404 page that Wilson has been seeing
Merge branch 'master' of github.com:weareytm/Ragnarok