Update yasnippet configuration

.gitmodules

@@ -13,6 +13,3 @@
 [submodule "site-lisp/asciidoc-el"]
 	path = site-lisp/asciidoc-el
 	url = ssh://git@github.com/metaperl/asciidoc-el
-[submodule "site-lisp/haskell-mode"]
-	path = site-lisp/haskell-mode
-	url = ssh://git@github.com/haskell/haskell-mode

rc/rc-haskell-mode.el

@@ -1,6 +1,6 @@
 ;;; rc-haskell-mode.el ---
 ;;(add-to-list 'load-path (concat my-site-lisp-directory "haskell-mode"))
-(load (concat my-site-lisp-directory "haskell-mode/haskell-site-file"))
+;; (load (concat my-site-lisp-directory "haskell-mode/haskell-site-file"))
 
 (add-hook 'haskell-mode-hook 'turn-on-haskell-doc-mode)
 ;; indentation modules are mutually exclusive. Only one of them can be used.

rc/rc-yasnippet.el

@@ -7,8 +7,6 @@
 ;; Requirements:
 ;; Status: not intended to be distributed yet
 
-(add-to-list 'load-path
-             (concat my-site-lisp-directory "yasnippet"))
 (require 'yasnippet)
 
 ;; (eval-after-load 'yasnippet
@@ -24,8 +22,8 @@
 ;;     ))
 ;; (add-hook 'after-save-hook 'alexott/update-yasnippets-on-save)
 
-(add-to-list 'yas/snippet-dirs "~/rc/snippets")
-(yas/global-mode 1)
+(add-to-list 'yas-snippet-dirs "~/rc/snippets")
+(yas-global-mode 1)
 
 ;;; rc-yasnippet.el ends here