Refactored search bar code, included location in search

Location included in search bar logic.  Code refactored to no longer include Q objects, and uses a simple in query.

Users can search for skill(s), location(s), or both.