Merge branch 'v3-template' of https://github.com/spond/hyphy into v3-template
Merge branch 'v3-template' of github.com:veg/hyphy into v3-template

Updating from the veg pull of Sergei's v3-template, after pulling
directly from Sergei. Might as well fix all merge conflicts at once.
Deduplicating Escape and Append Code and final GTESTs