pulled in some changes from kx499's branch with Rule Search
Merge pull request #92 from threatstream/rule-search

pulled in some changes from kx499's branch with Rule Search