stuff

dotfiles/emacs.d/package.el

@@ -1,8 +1,8 @@
 (require 'cl)
 
 (defvar my-packages '(ag auto-complete clojure-mode coffee-mode css-mode circe expand-region framemove flycheck
-                         esh-help enh-ruby-mode flymake-ruby ruby-block robe inf-ruby ac-inf-ruby rspec-mode
-                         fill-column-indicator flycheck-clojure flycheck-haskell flycheck-rust slim-mode feature-mode
+                         esh-help enh-ruby-mode ess flymake-ruby ruby-block robe inf-ruby ac-inf-ruby rspec-mode
+                         fill-column-indicator flycheck-clojure flycheck-haskell flycheck-rust slim-mode
                          flycheck-pos-tip gitignore-mode golden-ratio haskell-mode swiper sass-mode linum-relative
                          js2-mode less-css-mode magit neotree paredit scala-mode2 scss-mode smex powerline toml-mode
                          projectile rust-mode color-theme-solarized wrap-region stylus-mode rainbow-delimiters

dotfiles/zshrc

@@ -56,7 +56,7 @@ plugins=(git brew npm coffee)
 
 # User configuration
 
-export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
+export PATH="$PATH:$HOME/.rvm/bin:/usr/lib/rstudio/bin" # Add RVM to PATH for scripting
 . ~/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true
 
 # Haskell stuff