Add annotations for :search result classification
Add upper bounds to cabal package dependencies.
Merge pull request #1525 from bmsherman/searchAnnotation

Add annotations for :search result classification
Remove Cabal library dependency and add more upper bounds
Merge pull request #1528 from bmsherman/cabalUpperBounds2

Add upper bounds to cabal package dependencies (second try)
Merge remote-tracking branch 'upstream/master'

Merge due to conflicting changes.