Closes #26 and #25.
Merge branch 'master' of https://github.com/GovTribe/bat-search