diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index bd3476e..46f10c4 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -1,6 +1,8 @@
 #Portable across both mac and linux now
 export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
+export CC=/usr/bin/clang
+export CXX=/usr/bin/clang++
 if [[ "$OSTYPE" == "linux-gnu" ]]; then
   # Linux
   eval `dircolors ~/.dir_colors/dircolors`
@@ -18,6 +20,7 @@ export GOPATH=$HOME/go/
 export PATH=$PATH:"$GOPATH/bin"
 
 alias emacs='emacs -nw'
+alias vim='nvim'
 alias irssi='TERM=screen-256color irssi'
 alias scheme='rlwrap mit-scheme'
 alias startpg='pg_ctl -D /usr/local/var/postgres -l /usr/local/var/postgres/server.log start'
@@ -121,3 +124,7 @@ if hash opam 2>/dev/null; then
   eval `opam config env`
 fi
 
+# Source RVM if it exists
+if [ -f /home/$USER/.rvm/scripts/rvm ]; then
+  source /home/$USER/.rvm/scripts/rvm
+fi