Get snipmate working again. A few other tweaks.