diff --git a/gitignore b/gitignore
index f0ea18d..626be82 100644
--- a/gitignore
+++ b/gitignore
@@ -14,3 +14,4 @@ tmp/**/*
 release_package.sh
 local.fish
 local.env
+vim/sessions
diff --git a/notes/ray_emacs b/notes/ray_emacs
new file mode 100644
index 0000000..68771e9
--- /dev/null
+++ b/notes/ray_emacs
@@ -0,0 +1,179 @@
+(setq debug-on-error t)
+
+;;;; Package management
+
+;; Packages
+(require ‘package)
+
+;; package setup
+(package-initialize)
+(add-to-list ‘package-archives
+	     ‘(“melpa” . “http://melpa.milkbox.net/packages/“))
+(add-to-list ‘package-archives
+	     ‘(“marmalade” . “http://marmalade-repo.org/packages/“) t)
+;; (package-refresh-contents)
+
+;;;; Development
+
+;; Packages
+(require ‘yasnippet)
+(require ‘auto-complete)
+(require ‘autopair)
+(require ‘flycheck)
+(require ‘magit)
+
+;; Yasnippet setup
+;; None required
+
+;; Auto-complete setup
+;; TODO: Sort this setup
+(require ‘auto-complete-config)
+(add-to-list ‘ac-dictionary-directories “~/.emacs.d/ac-dict”)
+(ac-config-default)
+(ac-set-trigger-key “TAB”)
+(ac-set-trigger-key “<tab>“)
+(setq
+ ac-auto-start 2
+ ac-override-local-map nil
+ ac-use-menu-map t
+ ac-candidate-limit 20)
+
+;; Autopair setup
+;; None required
+
+;; Flycheck setup
+(global-flycheck-mode t)
+
+;; Magit setup
+(global-set-key “\C-xg” ‘magit-status)
+(setq magit-last-seen-setup-instructions “1.4.0")
+
+;;;; Python
+
+;; Packges for development
+(setq py-install-directory “~/.emacs.d/elpa/python-mode-20150520.353”)
+(add-to-list ‘load-path py-install-directory)
+(require ‘python-mode)
+(require ‘jedi)
+
+;; python-mode setup
+(add-to-list ‘auto-mode-alist ‘(“\\.py$” . python-mode))
+(setq py-electric-colon-active t)
+(add-hook ‘python-mode-hook ‘yas-minor-mode)
+(add-hook ‘python-mode-hook ‘auto-complete-mode)
+(add-hook ‘python-mode-hook ‘autopair-mode)
+
+;; Jedi setup
+(add-hook ‘python-mode-hook (lambda () (jedi:setup)))
+(setq jedi:complete-on-dot t)
+
+;; pdb setup
+;; Note the Python version
+(setq pdb-path ‘/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/pdb.py
+      gud-pdb-command-name (symbol-name pdb-path))
+(defadvice pdb (before gud-query-cmdline activate)
+  “Provide a better default command line when called interactively.”
+  (interactive
+   (list (gud-query-cmdline pdb-path
+			    (file-name-nondirectory buffer-file-name)))))
+;; Ensure local Python libraries can be found
+;; (setenv “PYTHONPATH” (concat “~/Projects/Blue-Peninsula/bp-content/local/lib/python2.7:” (getenv “PYTHONPATH”)))
+;; (setenv “PYTHONPATH” “~/Projects/Blue-Peninsula/bp-content/local/lib/python2.7")
+(setenv “PYTHONPATH” “/home/addgenie/virtualenvs/addgene/lib/python2.7:/home/addgenie/virtualenvs/addgene/lib/python2.7/site-packages”)
+
+;;;; JavaScript
+
+;; Packages
+(require ‘js2-mode)
+(require ‘ac-js2)
+(require ‘web-beautify)
+(require ‘tern)
+(require ‘tern-auto-complete)
+
+;; js-mode setup
+(add-to-list ‘auto-mode-alist ‘(“\\.json$” . js-mode))
+(add-hook ‘js-mode-hook ‘js2-minor-mode)
+(add-hook ‘js-mode-hook ‘yas-minor-mode)
+(add-hook ‘js2-mode-hook ‘ac-js2-mode)
+;; (setq js2-highlight-level 3)
+
+;; Tern setup
+(add-hook ‘js-mode-hook (lambda () (tern-mode t)))
+(add-hook ‘js-mode-hook ‘auto-complete-mode)
+(eval-after-load ‘tern
+  ‘(progn
+     (require ‘tern-auto-complete)
+     (tern-ac-setup)))
+(defun delete-tern-process ()
+  (interactive)
+  (delete-process “Tern”))
+
+;;;; R
+
+;; Packages
+(require ‘ess-site)
+
+;;;; MIT/GNU Scheme
+
+;; Packages
+(require ‘xscheme)
+
+;; xcheme setup
+(setq scheme-program-name “/Applications/mit-scheme.app/Contents/Resources/mit-scheme”)
+
+;;;; MATLAB
+
+;; Packages
+(add-to-list ‘load-path “~/.emacs.d/matlab-emacs”)
+(require ‘matlab-load)
+
+;; matlab-emacs setup
+;; None required
+
+;;;; Emacs
+
+;; Custom variables
+;; TODO: Sort these variables
+(custom-set-variables
+ ;; custom-set-variables was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won’t work right.
+ ‘(dired-use-ls-dired nil)
+ ‘(ess-default-style (quote DEFAULT))
+ ‘(ess-keep-dump-files “always”)
+ ‘(ess-use-auto-complete t)
+ ‘(indent-tabs-mode nil)
+ ‘(inferior-ess-client-command “Initial”)
+ ‘(inferior-ess-client-name “Initial”)
+ ‘(inferior-ess-ddeclient “Initial”)
+ ‘(inhibit-startup-screen t)
+ ‘(matlab-indent-level 2))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won’t work right.
+ )
+
+;; Path setup
+(setenv “PATH” (concat “/opt/local/bin:” (getenv “PATH”)))
+(setq exec-path (append ‘(“/opt/local/bin”) exec-path))
+(setenv “PATH” (concat “/usr/local/bin:” (getenv “PATH”)))
+(setq exec-path (append ‘(“/usr/local/bin”) exec-path))
+
+;; Frame setup
+(setq initial-frame-alist
+      ‘((top . 1) (left . 177) (width . 125) (height . 52)))
+
+;; dired setup
+(setq default-directory “/Users/raymondleclair/Projects”)
+
+;; ido setup
+(ido-mode t)
+
+;; ispell setup
+(setq ispell-program-name “/opt/local/bin/aspell”)
+
+;; abbrev-mode setup
+(setq abbrev-file-name “~/.emacs.d/abbrev_defs”)
\ No newline at end of file
diff --git a/notes/ray_emacs-notes b/notes/ray_emacs-notes
new file mode 100644
index 0000000..1ddea7a
--- /dev/null
+++ b/notes/ray_emacs-notes
@@ -0,0 +1,116 @@
+;;;; Requirements:
+
+;; + Emacs >= 24
+
+;; $ sudo pip install jedi
+;; $ sudo pip install epc
+
+;; $ sudo npm install -g js-beautify
+;; $ sudo npm install -g tern
+;; $ sudo npm install -g jshint
+
+;; $ cd ~/Packages
+;; $ git clone https://github.com/emacs-ess/ESS.git
+;; $ cd ESS
+;; $ make
+;; Run sudo make install twice. See: Makeconf
+;; # make install (for Applications/Emacs.app)
+;; # make install (for /opt/local/emacs)
+;; See: http://ess.r-project.org/Manual/ess.html
+
+;; + MIT/GNU Scheme
+;; See: http://www.gnu.org/software/mit-scheme/
+
+;; $ cd ~/.emacs.d
+;; $ cvs -d:pserver:anonymous@matlab-emacs.cvs.sourceforge.net:/cvsroot/matlab-emacs login
+;; $ cvs -z3 -d:pserver:anonymous@matlab-emacs.cvs.sourceforge.net:/cvsroot/matlab-emacs co -P matlab-emacs
+;; $ cd matlab-emacs
+;; $ make
+;; See: http://matlab-emacs.sourceforge.net/
+
+;; $ tar -zxvf aspell6-en-7.1-0.tar.gz
+;; $ cd aspell6-en-7.1-0
+;; $ ./configure
+;; $ make
+;; # sudo make install
+
+;;;; Package management
+
+;; M-x eval-buffer
+
+;; Packages
+(require ‘package)
+
+;; package setup
+(package-initialize)
+(add-to-list ‘package-archives
+         ‘(“melpa” . “http://melpa.milkbox.net/packages/“))
+(add-to-list ‘package-archives
+         ‘(“marmalade” . “http://marmalade-repo.org/packages/“) t)
+(package-refresh-contents)
+
+;; Package functions
+(defun install-if-needed (package)
+ (unless (package-installed-p package)
+   (package-install package)))
+
+;;;; Development
+
+;; Packages
+(setq to-install
+     ‘(yasnippet auto-complete autopair flycheck magit))
+(mapc ‘install-if-needed to-install)
+
+;;;; Python
+
+;; Requirements:
+;; $ sudo pip install jedi
+;; $ sudo pip install epc
+
+;; Packages
+(setq to-install
+     ‘(python-mode jedi))
+(mapc ‘install-if-needed to-install)
+
+;;;; JavaScript
+
+;; Requirements:
+;; $ sudo npm install -g js-beautify
+;; $ sudo npm install -g tern
+;; $ sudo npm install -g jshint
+
+;; Packages for development
+(setq to-install
+     ‘(js2-mode ac-js2 web-beautify tern tern-auto-complete))
+(mapc ‘install-if-needed to-install)
+
+;;;; R
+
+;; Requirements:
+;; $ cd ~/Packages
+;; $ git clone https://github.com/emacs-ess/ESS.git
+;; $ cd ESS
+;; $ make
+;; # make install
+;; See: http://ess.r-project.org/Manual/ess.html
+
+;;;; MIT/GNU Scheme
+
+;; Requirements:
+;; + MIT/GNU Scheme
+;; See: http://www.gnu.org/software/mit-scheme/
+
+;;;; MATLAB
+
+;; Requirements
+;; $ cd ~/.emacs.d
+;; $ cvs -d:pserver:anonymous@matlab-emacs.cvs.sourceforge.net:/cvsroot/matlab-emacs login
+;; $ cvs -z3 -d:pserver:anonymous@matlab-emacs.cvs.sourceforge.net:/cvsroot/matlab-emacs co -P matlab-emacs
+;; $ cd matlab-emacs
+;; $ make
+;; See: http://matlab-emacs.sourceforge.net/
+
+;;;; Emacs
+
+;; Requirements:
+;; $ sudo port install aspell
diff --git a/zshrc.local b/zshrc.local
index f02869d..56359d3 100644
--- a/zshrc.local
+++ b/zshrc.local
@@ -28,12 +28,14 @@ export GOPATH=$HOME/go
 
 # GPG stuff
 if [[ $OSTYPE == "darwin*" ]];then
+    echo "On Macos"
 	export PATH="/usr/local/opt/gnupg/libexec/gpgbin:$PATH"
 	export CFLAGS="-I/usr/local/opt/openssl/include -L/usr/local/opt/openssl/lib"
 	export LDFLAGS="-L/usr/local/opt/icu4c/lib"
 	export CPPFLAGS="-I/usr/local/opt/icu4c/include"
 	export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"
 fi
+export PATH="$HOME/.Pokemon-Terminal:$PATH"
 
 eval `ssh-agent -s` 
 if [ -e ~/.ssh/id_addgene ];then