Update 3iesite mux config
vim: recognise puppet files

And reorganise the autocommands a bit