Get rid of ip-phones-hack and avaya-hack wrongness
Add fixture for 'Legacy' VRF
Make Network.vrf required

...and the 'Legacy' VRF the default