diff --git a/dotfiles/ipython.py b/dotfiles/ipython.py
new file mode 100644
index 0000000..f758bda
--- /dev/null
+++ b/dotfiles/ipython.py
@@ -0,0 +1,4 @@
+import os, IPython
+os.environ['PYTHONSTARTUP'] = ''  # Prevent running this again
+IPython.start_ipython()
+raise SystemExit
diff --git a/dotfiles/vimrc b/dotfiles/vimrc
index f20669b..d42dddd 100644
--- a/dotfiles/vimrc
+++ b/dotfiles/vimrc
@@ -21,6 +21,7 @@ if filereadable(glob("~/.vim/bundle/Vundle.vim/README.md"))
   Plugin 'Matt-Deacalion/vim-systemd-syntax'
   Plugin 'fatih/vim-go'
   Plugin 'vhda/verilog_systemverilog.vim'
+  Plugin 'editorconfig/editorconfig-vim'
   call vundle#end()
 endif
 
diff --git a/dotfiles/zshrc.d/ipython.zsh b/dotfiles/zshrc.d/ipython.zsh
new file mode 100644
index 0000000..6dd7b40
--- /dev/null
+++ b/dotfiles/zshrc.d/ipython.zsh
@@ -0,0 +1,3 @@
+if which ipython >/dev/null 2>/dev/null ; then
+  export PYTHONSTARTUP="${HOME}/.ipython.py"
+fi