snipMate fix
merge