remove snipmate, it's not for me
Merge branch 'master' into ccap