remove snipmate mess
two new bundles