Resolved merge conflict and fixed bold bug for filter.
Resolved merge conflict with master.
Merge branch 'filter_feeds'
Merge branch 'master' of github.com:emreiser/loopd