Adding todos back in
Updated search results
Merge branch 'master' of https://github.com/laurenchow/paprika