Adding and/or/not conditions to simple text search in lib/filters.py
Changed .gitignore to add swap files, backup files.
merged changes from upstream
Fixed bugs in new version of SimpleTextFilter.isMatch(). AND OR NOT conditions now working; tests added to test/filters.doctest (all passing).
Added filtering to filters.py along with doctests in filters.doctest; still some bugs in the filtering and I need to make it more efficient
AND and OR conditions working properly (case-insensitive and unicode-friendly) in simpleTextFilter; doctests added to filters.doctest (passing); NOT condition syntax not yet implemented and NOT doctests commented out in filters.doctest
Merge branch 'master' of https://github.com/mNantern/QTodoTxt
Added to docstring for simpleTextFilter.isMatch
More work on fixing filtering error for parentheses.
Merge branch 'master' of https://github.com/mNantern/QTodoTxt
Finished workaround for parentheses. Added a test for this case in filters.doctest (passing)
sped up filtering slightly if search string has no parentheses
Merge pull request #55 from monotasker/master

Issue #47: Adding AND and OR syntax to text filter
Fixes #47: Remove an unnecessary print
added future task and URL with '*.*' to examples

rearranged htmlization to:
        achive consistent colorization of task with and without priority
        anticipate usage of css for layout instead of hardcoded attributes

adopted regex for URLs according to
        https://github.com/django/django/blob/master/django/core/validators.py
changed test so it doesn't end with the URL
fixed regex in _htmlizeURL
chaghi's fix
i also removed the takeItem-call since the item is already removed at this point. or do i miss something?
Fixes #41: Autocomplete from completed tasks
Merge pull request #70 from funkyfuture/issue-33

chaghi's fix for #33