resolved conflict with snipmate => tab shortcut
Merge branch 'master' of github.com:ivpusic/vim-files