removed old snipmate
Merge branch 'master' into stylus_fold_text