Support arbitrary options for tunnels
Fix ServerSpec to work with version 2.0+