Changes for snipmate