Add snipmate and fix mapping