added a check to see if yas-minor-mode is active before calling yas/expand
Merge branch 'master' of github.com:senny/emacs-eclim