Merge branch 'derek-new-queries' of https://github.com/derekvan/txtquery-tools
Merge remote-tracking branch 'upstream/master'
flipped editorial bit to get links
Merge remote-tracking branch 'upstream/master'

Conflicts:
	links between plain text and Reminders/FTMakeOrUpdateReminder.scpt
	perspectives.ftplugin/txtquery.sh
Merge branch 'master' of https://github.com/derekvan/txtquery-tools into derek-new-queries

Conflicts:
	perspectives.ftplugin/txtquery.sh
Merge branch 'derek-new-queries-old' into derek-new-queries