Switched tab characters to spaces on HTML files

Added criteria options to the search page
Merge branch 'master' of https://github.com/cdlib/shortcake
Started batch add/edit/deactivate page
Finished search page