Added keyword (general) search and changed filtering by type
Merge branch 'master' of https://github.com/jcmack/hackfsm