switch to vim plug, fix fzf stuff

bashrc

@@ -32,11 +32,7 @@ ec2-info() {
 }
 export EDITOR=vim
 export GOPATH=$HOME/code/go
-<<<<<<< Updated upstream
-export PATH=$HOME/Library/Python/2.7/bin:$HOME/bin:/usr/local/go/bin:$HOME/perl5/bin:/usr/sbin/:$GOPATH/bin:$PATH 
-=======
-export PATH=$HOME/bin:$HOME/gobin/go/bin/:/usr/local/go/bin:$HOME/perl5/bin:/usr/sbin/:$GOPATH/bin:$PATH 
->>>>>>> Stashed changes
+export PATH=$HOME/bin:$HOME/bin/fzf/bin/:$HOME/gobin/go/bin/:/usr/local/go/bin:$HOME/perl5/bin:/usr/sbin/:$GOPATH/bin:$HOME/Library/Python/2.7/bin:$PATH 
 [ -f $HOME/perl5/lib/perl5/Devel/Local.pm ] && source `which devel-local.sh`
 function github() {
     git clone [email protected]:SocialFlowDev/$1.git

install.sh

@@ -9,13 +9,14 @@ DIR="$(pwd)"
 	ln -sf "$DIR/jshintrc" "$HOME/.jshintrc"
     mkdir -p "$HOME/.vim/colors"
     mkdir -p "$HOME/.vim/plugin"
-    mkdir -p "$HOME/.vim/autoload"
+    #mkdir -p "$HOME/.vim/autoload"
     mkdir -p "$HOME/.vim/bundle"
     mkdir -p "$HOME/.ssh"
 	ln -sf "$DIR/ssh-config" "$HOME/.ssh/config"
     ln -sf "$DIR/vim-colors/molokaimod.vim" "$HOME/.vim/colors/molokaimod.vim"
     ln -sf "$DIR/vim-plugin/ack.vim" "$HOME/.vim/plugin/ack.vim"
     ln -sf "$DIR/vim-plugin/openssl.vim" "$HOME/.vim/plugin/openssl.vim"
     ln -sf "$DIR/vim-plugin/gnupg.vim" "$HOME/.vim/plugin/gnupg.vim"
-    ln -sf "$DIR/vim-autoload/pathogen.vim" "$HOME/.vim/autoload/pathogen.vim"
-    ln -sf "$DIR/vim-bundle" "$HOME/.vim/bundle"
+    #ln -sf "$DIR/vim-autoload/pathogen.vim" "$HOME/.vim/autoload/pathogen.vim"
+    ln -sf "$DIR/vim-autoload" "$HOME/.vim/autoload"
+    #ln -sf "$DIR/vim-bundle" "$HOME/.vim/bundle"

ssh-config

@@ -17,7 +17,7 @@ Host *.mars.sfsrv.net
 Host *.saturn.sfsrv.net
   User appuser
   ConnectTimeout 30
-  #ProxyCommand docker exec -i saturnvpn nc -q0 %h %p 2>/dev/null
+  ProxyCommand docker exec -i saturnvpn nc -q0 %h %p 2>/dev/null
   StrictHostKeyChecking false
   KbdInteractiveAuthentication false