Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
wrote first draft for displaying cfm searches
Merge pull request #69 from jpecht/master

displays cfm searches in crude table