Merge time and marq filters. Marq now handles the %letter time format strings and new $letter VLC format strings. Still needs some work.