Partial fix for #379

Not much changed. Had to rebase as Evan edited some of these files, should merge OK.

Issues:
- Pagination. Gave up eventually. I'll wait to see how you do it. 
- Ln191 of /concrete/blocks/search/controller.php needs your attention - I wasn't sure on the 'proper'y way to filter ak's. 

Hope this helps.