some changes, hi snipmate
Merge branch 'master' of github.com:lethom/myconf