Cleaned up to prepare for merge into upstream develop, fixed search glyphicon hover color