Re-added nt-vagrant, now tracking master