Merge pull request #2 from brabbins/master

Added search, fixed bugs, and filter by custom post type
Merge pull request #2 from ubc/master

Merge pull request #2 from brabbins/master