Search uses GenQuery and only presents the logical space

[korydraughn]

This PR also includes the following changes:

• Consolidates Metadata search and Property search into the same interface
• Use iRODS terminology in more places (e.g. File -> Data Object)

The formatting of the source code will cleaned up before being merged.