Get closer to Search working. Still some crash in layout stuff.

I needed to change the serializers for this to work, which required clearing the ES database.
Some refactoring
Forgot a line
Simplify layouts
Fix search view crash.

That was hellish. One little typo, and the debugger is totally useless.
Merge pull request #169 from stephenjust/search-fix

Get closer to Search working. Tapping on items still doesn't work.