As requested, removing AJAX/autocomplete in favor of select2.
Merge branch '5481' of github.com:openscholar/openscholar into 5481

Conflicts:
	openscholar/modules/os/modules/os_search_solr/os_search_solr.module
Opps.