Major cleanup
Major cleanup

- Separate out the search results from the actual category results a bit more.

- Add comments so we don't need to figure this whole thing out from scratch again.

- Initial steps for moving the bookmarks up into the navigation bar (instead of being in the scroller)

Signed-off-by: Blake Skinner <f2809f73afc906ecbb5ce29ea24012b18700bcc7@mit.edu>

smartcop/MIT-Mobile-for-iOS,MIT-Mobile/MIT-Mobile-for-iOS,xNUTs/MIT-Mobile-for-iOS,smartcop/MIT-Mobile-for-iOS,MIT-Mobile/MIT-Mobile-for-iOS,xNUTs/MIT-Mobile-for-iOS