add best bits of Chris Hunt's vim files