Update ft_main
ft_m_3 now talks about Bridges and VPNs

the ft_m_* files inconsistently include set -x. I don't know if this one needs it or not.
Merge remote-tracking branch 'origin/master'