Fixed up yasnippet in org mode, made some other changes I can't remember...