integrated solr edismax; broke the mapper

removed solr test controller
refactored search/current.gsp to search/index.gsp
added ajax call for query results
refined query handling; mapper works

mapper actually worked as of last commit, the ajax call to solr fixed
the separate delegation between solr and maps api
refined query string again

apparently, don't need to change the delimiter anymore?
impl query output logic for education field
generated new war file
renamed war file for easier deploy
revised site theme and layout
Update scraper to include websites in JSON and updated schema
fetched upstream
Merge remote-tracking branch 'upstream/master' into external-solr-io
updating branch with new json data
added website links to search results; updated solr schema and jsons
changed comp sci rankings to world rankings
adding university links to index
refined solr queries, results, and snippets
Merge remote-tracking branch 'upstream/master' into external-solr-io
Updating branch with upstream
cleaned up fields for json, added publication into json message
remove punctuation requirements in indexing and querying
created synonyms for abbr terms; dealing with qf tie conflicts
fixed regex to replace hyphens with spaces instead of stripping them
Fixed error with publication in json, updated schema with publication field