Support arbitrary options for tunnels

Also, fix ServerSpec to work with version 2.0+