Fixed yasnippet. All the trouble with org-mode seems made up.

The fixes proposed actually brakes yasnippet instead. At least if
installed with el-get.

Also I'm using the recipe from yasnippet's github page. Not el-get one.
Merge branch 'fix-yasnippet'