Fixed yasnippet configuration
Merge branch 'master' into emacs24