Merge pull request #430 from Tweeticoats/timestamp-trade14

A few more features, funscripts matching, excluding markers with matching strings and changes to marker titles and tags

Author: feederbox826