diff --git a/elisp/emacs-neotree b/elisp/emacs-neotree
index 43c4e8694..a0c415ac6 160000
--- a/elisp/emacs-neotree
+++ b/elisp/emacs-neotree
@@ -1 +1 @@
-Subproject commit 43c4e8694da9aa422c57175f3cc648d4b85aff58
+Subproject commit a0c415ac6726e316c1c7da720d96e417c49bd5f4
diff --git a/init/core-keymaps.el b/init/core-keymaps.el
index 39d19c3e9..52cbac1ef 100644
--- a/init/core-keymaps.el
+++ b/init/core-keymaps.el
@@ -36,9 +36,10 @@
           (kbd "s-M") 	'projectile-recentf
           (kbd "s-o") 	'ido-find-file
           (kbd "s-O") 	'open-major-mode-conf
-          (kbd "s-d") 	'mc/mark-next-like-this
-          (kbd "s-D") 	'mc/mark-previous-like-this
-          (kbd "C-s-d") 'mc/mark-all-like-this)
+          (kbd "s-'") 	'mc/mark-next-like-this
+          (kbd "s-\"") 	'mc/mark-previous-like-this
+          (kbd "C-s-'") 'mc/mark-all-like-this
+          (kbd "s-d")   'dash-at-point)
 
     ;; Newlines from insert mode
     (imap my/mode-map
@@ -61,8 +62,8 @@
 (evil-leader/set-leader ",")
 (evil-leader/set-key
   "`"       'my/notes
-  "d" 		'mc/mark-next-like-this
-  "D"		'mc/mark-all-like-this
+  "'" 		'mc/mark-next-like-this
+  "\""		'mc/mark-all-like-this
   "e"       'ido-find-file
   "E"       'my/initfiles
   "f"       'projectile-find-file
@@ -124,6 +125,20 @@
   (kbd "<C-return>")  'indent-new-comment-line
   )
 
+(emap my/mode-map
+  ;; Preserve buffer-movement in emacs mode
+  "j" 'evil-next-line
+  "k" 'evil-previous-line
+
+  (kbd "C-w h") 'evil-window-left
+  (kbd "C-w l") 'evil-window-right
+  (kbd "C-w j") 'evil-window-down
+  (kbd "C-w k") 'evil-window-up
+
+  (kbd "s-j") "5j"
+  (kbd "s-k") "5k"
+  )
+
 ;; Commenting lines
 (nmap my/mode-map "gcc" 'evilnc-comment-or-uncomment-lines)
 (vmap my/mode-map "gc"  'evilnc-comment-or-uncomment-lines)
@@ -138,19 +153,9 @@
 ;; Easy escape from insert mode
 (ichmap "jj" 'evil-normal-state)
 
-;; Preserve buffer-movement in emacs mode
-(emap my/mode-map
-      "j" 'evil-next-line
-      "k" 'evil-previous-line
-
-      (kbd "C-w h") 'evil-window-left
-      (kbd "C-w l") 'evil-window-right
-      (kbd "C-w j") 'evil-window-down
-      (kbd "C-w k") 'evil-window-up
-
-      (kbd "s-j") "5j"
-      (kbd "s-k") "5k")
-
+(nmap emacs-lisp-mode-map "gd"
+      (λ (let ((func (function-called-at-point)))
+           (if func (find-function func)))))
 
 ;;;; Ex Commands ;;;;;;;;;;;;;;;;
 
diff --git a/init/core.el b/init/core.el
index 75231949e..421c7c27e 100644
--- a/init/core.el
+++ b/init/core.el
@@ -26,6 +26,8 @@
       initial-major-mode 'text-mode
       initial-scratch-message nil)
 
+(setq require-final-newline nil)
+
 (setq-default use-dialog-box nil)
 (setq-default enable-recursive-minibuffers nil)
 (setq-default visible-bell nil)
diff --git a/init/mod-dev.el b/init/mod-dev.el
index 25b7c7a72..7c90039d1 100644
--- a/init/mod-dev.el
+++ b/init/mod-dev.el
@@ -1,4 +1,17 @@
+(add-to-list 'auto-mode-alist '("\\.plist\\'" . nxml-mode))
+
+(use-package dash-at-point :ensure t
+  :commands (dash-at-point dash-at-point-with-docset)
+  :if is-mac
+  :config
+  (progn
+    (add-to-list 'dash-at-point-mode-alist '(ruby-mode . "rb"))
+    (add-to-list 'dash-at-point-mode-alist '(python-mode . "py2"))
+    )
+  )
+
 (use-package yaml-mode :ensure t :mode "\\.yaml\\'")
+
 (use-package json-mode :ensure t
   :mode (("\\.json\\'" . json-mode)
          ("\\.jshintrc\\'" . json-mode)))
@@ -33,8 +46,6 @@
   :interpreter "ruby"
   :config
   (progn
-    (my/setup-run-code ruby-mode-map "ruby")
-
     (require 'ruby-mode-indent-fix)
     (setq ruby-indent-level 4)
     (setq ruby-deep-indent-paren nil)
@@ -47,13 +58,16 @@
 
     (use-package rbenv :ensure t)
     (use-package inf-ruby :ensure t
-      :config
-      (evil-set-initial-state 'inf-ruby-mode 'insert)
-      :init
-      (add-to-list 'ac-modes 'inf-ruby-mode))
+      :config (evil-set-initial-state 'inf-ruby-mode 'insert)
+      :init (add-to-list 'ac-modes 'inf-ruby-mode))
     (use-package ac-inf-ruby :ensure t
-      :init
-      (add-hook 'inf-ruby-mode-hook 'ac-inf-ruby-enable))))
+      :init (add-hook 'inf-ruby-mode-hook 'ac-inf-ruby-enable))
+
+    ;;
+    (my/setup-run-code ruby-mode-map "ruby")
+    (nmap ruby-mode-map "gd" 'rsense-jump-to-definition)
+    ))
+
 
 ;;
 (provide 'mod-dev)
diff --git a/snippets b/snippets
index 5b2c4ff2b..73c18fd74 160000
--- a/snippets
+++ b/snippets
@@ -1 +1 @@
-Subproject commit 5b2c4ff2b7b7bf2c6ce59c21d44254b0e48c4ba7
+Subproject commit 73c18fd74e7c90483c665ea25d9e825a18904359