Basic searching functionality
Merge branch 'develop' into features/more_searching
Merge pull request #325 from empirical-org/features/more_searching

Features/more searching