yasnippet not bundle
Merge branch 'master' of github.com:danielsz/.emacs.d