diff --git a/scripts/borg.sh b/scripts/borg.sh
new file mode 100755
index 0000000..c61438b
--- /dev/null
+++ b/scripts/borg.sh
@@ -0,0 +1,11 @@
+#!/bin/zsh
+set -e
+mkdir -p ~/applications
+\cd ~/applications
+virtualenv --python=python3 borg-env
+pip install 'llfuse<0.41'
+source borg-env/bin/activate
+pip install borgbackup
+mkdir -p ~/bin
+ln -s $(readlink -e borg-env/bin/borg) ~/bin/borg
+\cd -
diff --git a/scripts/youcompleteme.sh b/scripts/youcompleteme.sh
index d2c7c7d..afe6682 100755
--- a/scripts/youcompleteme.sh
+++ b/scripts/youcompleteme.sh
@@ -5,6 +5,7 @@ echo -n "Press enter to continue..."
 read a
 mkdir ~/ycm_build
 cd ~/ycm_build
+touch .nobackup
 cmake -G "Unix Makefiles" . ~/.vim/plugged/YouCompleteMe/third_party/ycmd/cpp
 make ycm_support_libs
 cd -
diff --git a/shells/zshrc b/shells/zshrc
index fbe7881..8e2d61c 100644
--- a/shells/zshrc
+++ b/shells/zshrc
@@ -17,12 +17,35 @@ fi
 export DISABLE_AUTO_TITLE=true
 export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:$(readlink -e ~/bin)"
 export EDITOR='vim'
-function asroot(){
+# For pasting in commands that start with $
+$ () {
+  $*
+}
+asroot(){
   # Use temporary file for added security
   TEMPFILE=$(tempfile)
   xauth extract $TEMPFILE $DISPLAY
   sudo zsh -c "xauth merge $TEMPFILE;(srm $TEMPFILE||rm $TEMPFILE)&'$@';"
 }
+dsl() {
+  while (( $# > 0 )); do
+    readlink $1 2>&1 >/dev/null && mv $(readlink $1) $1
+    shift
+  done
+}
+dedir(){
+  mv "$1"/* .
+  rmdir "$1"
+  if (( !? != 0 )); then
+    mv "$1"/.* .
+  fi
+  rmdir "$1"
+}
+alias cpatch='diff -crB'
+alias capatch='patch --dry-run -p1 -i'
+alias apatch='patch -p1 -i'
+alias pg="pcregrep -M"
+alias eix="eix -F"
 alias mouse1="xmodmap <(echo pointer = 1 2 3)"
 alias mouse2="xmodmap <(echo pointer = 3 2 1)"
 alias where="readlink -e"
@@ -37,7 +60,7 @@ alias ll='ls -AlhF'
 alias la='ls -A'
 alias l='ls -CF'
 alias logout='sudo pkill -u $USER'
-function rsh(){
+rsh(){
   if [ -z $1 ] ; then
     echo "Valid hostnames:"
     cat /home/stonewareslord/syncthing/shared/ips
@@ -52,7 +75,7 @@ function rsh(){
   echo "SSH to $ADDR..."
   tsh $ADDR $*
 }
-function fixsh(){
+fixsh(){
   sed -i -e $1"d" ~/.ssh/known_hosts
 }
 alias tmux='tmux -2'
@@ -60,8 +83,8 @@ alias less='less -R'
 alias tree='tree -C'
 alias skim="(head -5; tail -5) <"
 alias cp='rsync --partial -ha --info=progress2 "$@"'
-function mv() { /bin/mv -v "$@" }
-function m() { mv "$@" }
+mv() { /bin/mv -v "$@" }
+m() { mv "$@" }
 compdef _cp c m mv cp copy
 alias dt='date "+%F %T"'
 alias awake='disphost; while true; do xdotool mousemove 0 0; sleep 60; done'
@@ -85,7 +108,7 @@ if test -f /etc/gentoo-release; then
     echo "args: $*"
     sudo zsh -c "emerge --autounmask-write -av $*"
   }
-  function update(){
+  update(){
     # If this is a server computer
     if [ "$(hostname|cut -b1)" = "S" ] ; then
       echo "You're a server. Exiting"
@@ -144,19 +167,22 @@ alias -g L="2>&1|less"
 #alias -g L="2>&1|vimpager"
 alias -g G='|& ag'
 export FZF_COMPLETION_OPTS='--no-mouse -m -1 -x'
-function ctar(){
+ctar(){
   tar -cf - $@|pv -WcN tar|gzip|pv -WcN gzip
   #tar -cf - $@|pv -WcN tar -s $(echo $(du -sb $@|awk '{print $1}'|tr '\n' '+')0|bc)|gzip|pv -WcN dest
   #tar -cf - $@|pv -WcN tar -s $(echo $(du -sb $@|awk '{print $1}'|tr '\n' '+')0|bc)|gzip|pv -WcN dest
 }
-function offline(){
-  echo unshare -n --  sh -c "sudo -u stonewareslord zsh -c '$@'"
-  sudo unshare -n --  sh -c "sudo -u stonewareslord zsh -c '$@'"
+offline(){
+  if [ ! -z "$@" ] ; then
+    sudo unshare -n -- sudo -u stonewareslord zsh -c "$@"
+  else
+    sudo unshare -n -- sudo -u stonewareslord LP_MARK_PREFIX=" $(tput setaf 1)(offline)$(tput sgr0) " zsh
+  fi
 }
-function smon(){
+smon(){
   timeout 1s pdsh -R ssh -w 10.0.1.196,10.0.1.207 "$@"
 }
-function dnstest(){
+dnstest(){
   echo "resolv.conf:"
   cat /etc/resolv.conf
   echo "Testing DNS:"
@@ -169,7 +195,7 @@ function dnstest(){
   echo "Testing DNS"
   curl ifconfig.me
 }
-function cinitify(){
+cinitify(){
   mkdir $2
   cd $2
   git init
@@ -194,7 +220,7 @@ function cinitify(){
     git checkout master
   fi
 }
-function initify(){
+initify(){
   git init
   git remote add origin git@austenwares.com:$1/$2.git
   git remote add https https://austenwares.com/gitlab/$1/$2.git
@@ -210,7 +236,7 @@ function initify(){
     git checkout master
   fi
 }
-function tsh(){
+tsh(){
   ssh $* -X
   if which ponysay >/dev/null; then
     ponysay "Connection closed!"
@@ -218,11 +244,11 @@ function tsh(){
     echo "\n\n\n\n\n\n\n\n\n\nSESSION CLOSED\n\n\n\n\n\n\n\n\n\n"
   fi
 }
-function mcl(){
+mcl(){
   mkdir -p $1
   cd $1
 }
-function rc(){
+rc(){
   case $1 in
     z) vim ~/.zshrc;;
     v) vim ~/.vimrc;;
@@ -235,24 +261,50 @@ function rc(){
     *) echo "Opts:\nz v i\nuse make unmask mask accept_keywords"
   esac
 }
-function pub-git-init(){
+pub-git-init(){
   # Get the project name
-  branch=$(git remote -v | ag '^origin\s+' | sed -e 's/^origin\s*//' | cut -d\  -f1 | sed -e 's/^.\+\///'  -e 's/\.git$//' | head -n1)
+  branch=$(git remote -v | ag '^origin\s+' | sed -e 's/^origin\s*//' | cut -d\  -f1 | sed -r -e 's/^.+\///' -e 's/#.+$//' -e 's/\.git$//' | head -n1)
+  echo "Branch: $branch"
   # Get the hashed project name
-  enc_branch=$("$branch" | sha512sum | cut -d\  -f1)
-  git remote add local "git@localhost:$branch"
+  enc_branch=$(echo "$branch" | sha512sum | cut -d\  -f1)
+  git remote add local "gcrypt::git@localhost:stonewareslord/79a79b1a6e37813d9226872c6428aca29eec9f6111558109861cb0dcd2f0ffc8198deea4e361f84e170989212452fdfb21e0ef690da2ad399c03ce308d79dcfe#$enc_branch"
   git remote add ncsu "gcrypt::git@github.ncsu.edu:agadler/a86a0f8757772be2ec617b395a0716679bfce51c1bfdeb8da6127feebd84facde645e9e30188318344eb458f5834e3d86800.git#$enc_branch"
   git remote add gitlab "gcrypt::git@gitlab.com:stonewareslord/e6e03ea006d55de0970a28bcb7fcf65f4c66f98f50830bd69b50c5dc502bdf1a4e4172187cfb5fcef8c32bd7fb316bdc67d7d86713ebfe232f97eb303ac316ae.git#$enc_branch"
+  git remote add aws "gcrypt::git@aws:stonewareslord/5e0701d5b5b2118127d378c084be9a1dfb33d185d3e2c5da30a3984f5118e3d5136f3f3b038462bccd538e93f9e32cb06136.git#$enc_branch"
   git config remote.ncsu.gcrypt-participants "CCDFE3F1"
   git config remote.gitlab.gcrypt-participants "CCDFE3F1"
 }
-function pub-git-clone(){
+pub-git-rm(){
+  if (( $# == 0 )) ; then
+    git remote rm local
+    git remote rm ncsu
+    git remote rm gitlab
+    git remote rm aws
+  fi
+  while (( $# > 0 )) ; do
+    git remote rm "$1"
+    shift
+  done
+}
+pub-git-push(){
+  if (( $# == 0 )) ; then
+    git push local --all && git push local --tags
+    git push ncsu --all && git push ncsu --tags
+    git push gitlab --all && git push gitlab --tags
+    git push aws --all && git push aws --tags
+  fi
+  while (( $# > 0 )) ; do
+    git push "$1" --all && git push "$1" --tags
+    shift
+  done
+}
+pub-git-clone(){
   case $1 in
     ncsu)   remote="gcrypt::git@github.ncsu.edu:agadler/a86a0f8757772be2ec617b395a0716679bfce51c1bfdeb8da6127feebd84facde645e9e30188318344eb458f5834e3d86800.git#" ;;
     gitlab) remote="gcrypt::git@gitlab.com:stonewareslord/e6e03ea006d55de0970a28bcb7fcf65f4c66f98f50830bd69b50c5dc502bdf1a4e4172187cfb5fcef8c32bd7fb316bdc67d7d86713ebfe232f97eb303ac316ae.git#" ;;
-    #TODO: Fix enc_branch
-    local)  remote="git@localhost:" ;;
-    *)      echo "Opts: ncsu gitlab local" ; return 1
+    local)  remote="gcrypt::git@localhost:stonewareslord/79a79b1a6e37813d9226872c6428aca29eec9f6111558109861cb0dcd2f0ffc8198deea4e361f84e170989212452fdfb21e0ef690da2ad399c03ce308d79dcfe#" ;;
+    aws)  remote="gcrypt::git@aws:stonewareslord/5e0701d5b5b2118127d378c084be9a1dfb33d185d3e2c5da30a3984f5118e3d5136f3f3b038462bccd538e93f9e32cb06136.git#" ;;
+    *)      echo "Opts: local ncsu gitlab" ; return 1
   esac
   shift
   if [ -z "$1" ] ; then
@@ -262,7 +314,7 @@ function pub-git-clone(){
   branch=$(echo $1 | sha512sum | cut -d\  -f1)
   git clone "$remote$branch" $1
 }
-function k(){
+k(){
   #More than 1 arguement
   if [[ $# > 1 ]] ; then
     vim $@
@@ -332,3 +384,7 @@ echo -ne '[##### ]\r'
 antigen apply
 echo -ne '[######]\r'
 echo
+
+# OPAM configuration
+. /home/stonewareslord/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true
+(( $+TMUX )) && unset zle_bracketed_paste
diff --git a/vim/vimrc b/vim/vimrc
index b48aeb5..56d25eb 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -2,193 +2,205 @@
 if has('conceal')
   set conceallevel=2 concealcursor=i
 endif
-nnoremap <Leader>autoformat! :%s/, /,<CR>:%s/ \/ /\/<CR>:%s/ {/{<CR>:%s/} /}<CR>:%s/ = /=
+let g:formatdef_my_custom_cpp = '"astyle --mode=cpp -xc --style=google -j -s2 -xG -S -K -N -xn -xl -n -p -H"'
+let g:formatters_cpp = ['my_custom_cpp']
+let g:formatdef_my_custom_java = '"astyle --mode=java -xc --style=google -j -s3 -xG -S -K -N -xn -xl -n -p -H"'
+let g:formatters_java = ['my_custom_java']
+let g:UltiSnipsUsePythonVersion=3
 command! WW %!sudo tee > /dev/null %
 "TODO: Fix this
 "let g:rbpt_loadcmd_toggle = 1
-"autocmd BufRead,BufNewFile * RainbowParenthesesActivate
-""autocmd BufRead,BufNewFile * RainbowParenthesesToggle
-""autocmd BufRead,BufNewFile * RainbowParenthesesLoadBraces
-"autocmd BufRead,BufNewFile * RainbowParenthesesLoadRound
-"autocmd BufRead,BufNewFile * RainbowParenthesesLoadSquare
-"autocmd BufRead,BufNewFile * RainbowParenthesesLoadChevrons
 let g:indent_guides_auto_colors = 0
+autocmd FileType java set shiftwidth=3 tabstop=3 softtabstop=3 expandtab
 autocmd VimEnter,Colorscheme * :hi IndentGuidesOdd  guibg=darkgrey ctermbg=darkgrey
 autocmd VimEnter,Colorscheme * :hi IndentGuidesEven guibg=grey ctermbg=grey
 filetype plugin on
 set grepprg=grep\ -nH\ $*
 let g:tex_flavor='latex'
 
-
 "match Error /\s\+$/
-"nnoremap s xa
-"nnoremap <F5> :UndotreeToggle<CR>
-"inoremap <expr><Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
-imap <Expr>\ neosnippet#expandable_or_jumpable() ? "\<Plug>(neosnippet_expand_or_jump)" : pumvisible() ? "\<C-n>" : "\<TAB>"
-smap <Expr>\ neosnippet#expandable_or_jumpable() ? "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>"
-nnoremap <Leader><Space> :CtrlPTag<CR>
-nnoremap <C-w>\| <C-w>v<C-w>l
-nnoremap <C-w>- <C-w>s<C-w>j
-nnoremap <C-d> <C-w>q
-nnoremap G G$
-vnoremap G G$
-nnoremap <F5> :GundoToggle<CR>
-nnoremap + <C-a>
-nnoremap - <C-x>
-nnoremap Q <Nop>
-nnoremap <Leader><Leader> <C-^>
-nnoremap <Leader>a :!git st<CR>:!ls<CR>:!git a
-nnoremap <Leader>up :!git pull origin
-nnoremap <Leader>st :!git st<CR>
-nnoremap <Leader>ci :!git st<CR>:!git ci ""<Left>
-nnoremap <Leader>log :!git hist<CR>
-nnoremap <Leader>br :!git br<CR>
-nnoremap gb :ls<CR>:b
-nnoremap <Leader>d :bd
-nnoremap <Leader>q :q
-nnoremap <Leader>W :%s/\s\+$//<CR>:let @/=''<CR>
-nnoremap <Leader>o m`o<Esc>``
-nnoremap <Leader>O m`O<Esc>``
-nnoremap <Leader>go %m`%x``
-nnoremap <Leader>if m"Oif(){<Esc>jo}<Esc>`"v><Esc>k^wa
-nnoremap <Leader>else m"kAelse{<Esc>jo}<Esc>`"v><Esc>
-nnoremap <Leader>for m"Ofor(){<Esc>jo}<Esc>`"v><Esc>k^wa
-nnoremap <Leader>while m"Owhile(){<Esc>jo}<Esc>`"v><Esc>k^wa
-nnoremap <Leader>rm m"kddjddkv<<Esc>`"
-nnoremap <Leader># O#{{{<Esc>jo#}}}<Esc>kk^a
-vnoremap <Leader># <Esc>`<O#{{{<Esc>`>o#}}}<Esc>`<k^a
-nnoremap <Leader>{ O//{{{<Esc>jo//}}}<Esc>kk^la
-vnoremap <Leader>{ <Esc>`<O//{{{<Esc>`>o//}}}<Esc>`<k^la
-vnoremap <Leader>if <Esc>`<Oif(){<Esc>`>o}<Esc>gv><Esc>`<k^wa
-vnoremap <Leader>else <Esc>`<kAelse{<Esc>`>o}<Esc>gv><Esc>
-vnoremap <Leader>for <Esc>`<Ofor(){<Esc>`>o}<Esc>gv><Esc>`<k^wa
-vnoremap <Leader>while <Esc>`<Owhile(){<Esc>`>o}<Esc>gv><Esc>`<k^wa
-vnoremap <Leader>rm <Esc>`<<Esc>kdd`>jddgv<<Esc>
-vnoremap <silent> * :call VisualSelection('f')<CR>
-vnoremap <silent> # :call VisualSelection('b')<CR>
-"nnoremap <Space> zo:set hlsearch! hlsearch?<CR>
-"nnoremap <Space> :nohlsearch<CR>g<C-g>zo
-nnoremap <BS> :nohlsearch<CR>g<C-g>zo
-nnoremap U <C-r>
-nnoremap K i<CR><Esc>k$
-nnoremap <Enter> :up<CR>:silent! call sy#start()<CR>
-vnoremap gj j
-vnoremap gk k
-vnoremap j gj
-vnoremap k gk
-vnoremap H ^
-vnoremap L $h
-vnoremap ; :
-nnoremap gj j
-nnoremap gk k
-nnoremap j gj
-nnoremap k gk
-nnoremap H ^
-nnoremap L $
-nnoremap <C-h> <C-w>h
-nnoremap <C-j> <C-w>j
-nnoremap <C-k> <C-w>k
-nnoremap <C-l> <C-w>l
-map , <Plug>(easymotion-prefix)
-nnoremap ! :!
-"nnoremap ; m"A;<Esc>`"
-vnoremap < <gv
-vnoremap > >gv
-nnoremap <F1> <nop>
-inoremap <F1> <nop>
-vnoremap <F1> <nop>
-nnoremap <Leader>** yyPv$r*jyypv$r*
-nnoremap <Leader>= yypv$r=
-nnoremap <Leader>- yypv$r-
-nnoremap <Leader>^ yypv$r^
-nnoremap <Leader>" yypv$r"
-"inoremap ;; <Esc>m`A;<Esc>``a
-"inoremap ;;<Space> <Esc>A;<Esc>o
-"nnoremap ;; m"A;<Esc>`"
-"nnoremap ;;<Space> A;<Esc>o
-nnoremap Y y$
-nnoremap <Up> <C-w>w
-nnoremap <Down> <C-w>W
-nnoremap <Left> :bp<CR>
-nnoremap <Right> :bn<CR>
-nnoremap <C-w>z <C-w>_<C-w>\|
-"nnoremap <Leader>bun G?Plug <CR>yyjp$hdi'"+gP0Wl3d/\/<CR>xjyyP$"+gp<Esc>:nohlsearch<CR>:up<CR>:PluginInstall
-nnoremap <Leader>bun G?Plug <CR>yyjp$hdi'"+gPo  " \| <Esc>"+gp<Esc>:nohlsearch<CR>:up<CR>:PlugInstall
-nnoremap <Leader><C-p> :CtrlPFunky<CR>
-nnoremap <F2> :set invpaste<CR>
-"nnoremap <C-Up> [e
-"nnoremap <C-Down> ]e
-"vnoremap <C-Up> [egv
-"vnoremap <C-Down> ]egv
-nnoremap / /\v
-vnoremap / /\v
-inoremap jk <Esc>A
-inoremap kj <Esc>A
-set tags=./tags;/
-set wildmode=longest,list,full
-set gfn=Monospace\ 8
-set guioptions=
-set guicursor+=n-v-c:blinkon0
-set ttimeout
-set ttimeoutlen=0
-set notimeout
-set formatoptions-=r
-set formatoptions-=o
-set diffopt+=iwhite
-set noesckeys
-set mouse-=a
-set shiftwidth=2
-set tabstop=2
-set modeline
-set softtabstop=2
-set expandtab
-set history=1000
-set hidden
-set cursorline
-set incsearch
-set showmatch
-set hlsearch
-set scrolloff=3
-set scrolljump=5
-set autoindent
-set backup
-set backupdir=~/.vim/backup
-set directory=~/.vim/tmp
-set undolevels=1000
-set history=500
-set ttyfast
-set fileformat=unix
-set encoding=utf-8
-set laststatus=2
-set foldmethod=indent
-set foldnestmax=10
-set foldlevel=2
-set relativenumber
-set number
-set ts=2 sw=2 et
-set background=dark
-set t_Co=256
-set gdefault
-set nocompatible
-"set rtp+=~/.vim/bundle/vundle/
-set ignorecase
-set textwidth=0
-syntax on
-"let g:AutoPairs = {'(':')', '[':']', '{':'}',"'":"'",'"':'"', '`':'`', '<':'>', '%':'%'}
+" Basic, very important mappings {
+  " Movement {
+    "Vertical
+    nnoremap gj j
+    nnoremap gk k
+    nnoremap j gj
+    nnoremap k gk
+    vnoremap gj j
+    vnoremap gk k
+    vnoremap j gj
+    vnoremap k gk
+    "Horizontal
+    nnoremap Y y$
+    nnoremap H ^
+    nnoremap L $
+    vnoremap L $h
+    vnoremap H ^
+    "Move to end of line
+    inoremap jk <Esc>A
+    inoremap kj <Esc>A
+    "Move to last character of last line
+    nnoremap G G$
+    vnoremap G G$
+  " }
+  " Buffers {
+    "Control-key movement
+    nnoremap <C-h> <C-w>h
+    nnoremap <C-j> <C-w>j
+    nnoremap <C-k> <C-w>k
+    nnoremap <C-l> <C-w>l
+    "Arrow keys
+    nnoremap <Up> <C-w>w
+    nnoremap <Down> <C-w>W
+    nnoremap <Left> :bp<CR>
+    nnoremap <Right> :bn<CR>
+    "Vertical and horizontal split
+    nnoremap <C-w>\| <C-w>v<C-w>l
+    nnoremap <C-w>- <C-w>s<C-w>j
+    "Close buffer
+    nnoremap <C-d> <C-w>q
+    "Fullscreen buffer
+    nnoremap <C-w>z <C-w>_<C-w>\|
+    "Go to last buffer
+    nnoremap <Leader><Leader> <C-^>
+  " }
+  " Misc {
+    vnoremap <silent> * :call VisualSelection('f')<CR>
+    vnoremap <silent> # :call VisualSelection('b')<CR>
+    vnoremap ; :
+    nnoremap ! :!
+    vnoremap < <gv
+    vnoremap > >gv
+    "Disable F1
+    nnoremap <F1> <nop>
+    inoremap <F1> <nop>
+    vnoremap <F1> <nop>
+    "F2 toggle paste
+    nnoremap <F2> :set invpaste<CR>
+    "Better searching
+    nnoremap / /\v
+    vnoremap / /\v
+    "Addition and subtraction
+    nnoremap + <C-a>
+    nnoremap - <C-x>
+    "Backspace remove highlights
+    nnoremap <BS> :nohlsearch<CR>g<C-g>zo
+    "Better save
+    nnoremap <Enter> :up<CR>:silent! call sy#start()<CR>
+    "Unmap Q
+    nnoremap Q <Nop>
+  " }
+" }
+" Plugin mappings {
+  "Easymotion
+  map , <Plug>(easymotion-prefix)
+  "Ctrl-p
+  nnoremap <Leader><C-p> :CtrlPFunky<CR>
+  "Gundo
+  nnoremap <F5> :GundoToggle<CR>
+  "Easytags
+  nnoremap <Leader><Space> :CtrlPTag<CR>
+  "Tagbar
+  "nnoremap <Leader><Space> :Tagbar<CR>
+  "Add a bundle from clipboard
+  nnoremap <Leader>bun G?Plug <CR>yyjp$hdi'"+gPo  " \| <Esc>"+gp<Esc>:nohlsearch<CR>:up<CR>:PlugInstall
+  "Automatic if/else/for/while wrappers
+  nnoremap <Leader>if m"Oif(){<Esc>jo}<Esc>`"v><Esc>k^wa
+  nnoremap <Leader>else m"kAelse{<Esc>jo}<Esc>`"v><Esc>
+  nnoremap <Leader>for m"Ofor(){<Esc>jo}<Esc>`"v><Esc>k^wa
+  nnoremap <Leader>while m"Owhile(){<Esc>jo}<Esc>`"v><Esc>k^wa
+  nnoremap <Leader>rm m"kddjddkv<<Esc>`"
+  vnoremap <Leader>if <Esc>`<Oif(){<Esc>`>o}<Esc>gv><Esc>`<k^wa
+  vnoremap <Leader>else <Esc>`<kAelse{<Esc>`>o}<Esc>gv><Esc>
+  vnoremap <Leader>for <Esc>`<Ofor(){<Esc>`>o}<Esc>gv><Esc>`<k^wa
+  vnoremap <Leader>while <Esc>`<Owhile(){<Esc>`>o}<Esc>gv><Esc>`<k^wa
+  vnoremap <Leader>rm <Esc>`<<Esc>kdd`>jddgv<<Esc>
+" }
+" Trial mappings {
+  nnoremap <Leader>o m`o<Esc>``
+  nnoremap <Leader>O m`O<Esc>``
+" }
+
+
+" Gui options {
+  set gfn=Monospace\ 8
+  set guioptions=
+  set guicursor+=n-v-c:blinkon0
+  set mouse-=a
+" }
+" Annoyance fixes {
+  "Annoying escape timeouts
+  set ttimeout
+  set ttimeoutlen=0
+  set notimeout
+" }
+" Misc {
+  set tabstop=2 shiftwidth=2 expandtab
+  set tags=./tags;/
+  set wildmode=longest,list,full
+  set formatoptions-=r
+  set formatoptions-=o
+  set diffopt+=iwhite
+  set noesckeys
+  set shiftwidth=2
+  set tabstop=2
+  set modeline
+  set softtabstop=2
+  set expandtab
+  set history=1000
+  set hidden
+  set cursorline
+  set incsearch
+  set showmatch
+  set hlsearch
+  set scrolloff=3
+  set scrolljump=5
+  set autoindent
+  set backup
+  set backupdir=~/.vim/backup
+  set directory=~/.vim/tmp
+  set undolevels=1000
+  set history=500
+  set ttyfast
+  set fileformat=unix
+  set encoding=utf-8
+  set laststatus=2
+  set foldmethod=indent
+  set foldnestmax=10
+  set foldlevel=2
+  set relativenumber
+  set number
+  set background=dark
+  set t_Co=256
+  set gdefault
+  set nocompatible
+  set ignorecase
+  set textwidth=0
+  syntax on
+" }
+
+"Signify
 let g:signify_vcs_list = [ 'git', 'svn' ]
 let g:signify_difftool = 'diff'
+"CtrlP
 let g:ctrlp_root_markers = ['.cproot']
 let g:ctrlp_custom_ignore = {
   \ 'dir':  '\v[\/](\.git|\.hg|\.svn|vendor)$',
-  \ 'file': '\v\.(exe|so|dll)$',
+  \ 'file': '\v\.(exe|so|dll|class)$',
   \ 'link': 'SOME_BAD_SYMBOLIC_LINKS',
   \ }
+let g:ctrlp_extensions=['funky']
+"Airline
 let g:airline_left_sep='▶'
 let g:airline_right_sep='◀'
 let g:airline#extensions#syntastic#enabled=0
+let g:ycm_show_diagnostics_ui=0
+let g:syntastic_cpp_compiler = 'clang++'
+let g:syntastic_cpp_compiler_options = ' -std=c++11 -stdlib=libc++'
 let g:airline#extensions#whitespace#enabled=0
 let g:airline#extensions#whitespace#show_message=0
 let g:airline#extensions#tmuxline#enabled=1
+"Autoformat
 let g:formatdef_my_custom_php = '"astyle --mode=php -xc -A10 -j -s2 -xG -S -K -N -xn -xl -n"'
 let g:formatdef_my_custom_cpp = '"astyle --mode=c -xc -A10 -j -s2 -xG -S -K -N -xn -xl -n"'
 let g:formatter_cpp = ['formatdef_my_custom_cpp']
@@ -197,44 +209,34 @@ let g:formatter_php = ['formatdef_my_custom_php']
 "let g:formatprg_args_expr_cpp=" --mode=c --style=1tbs -xe -k1 -j"
 " These flags don't work for some reason
 " -xn -xc -xl -S
-"let g:airline#extensions#tabline#enabled=1
-let g:Powerline_symbols='fancy'
+"Syntastic
+let g:syntastic_java_javac_classpath = "/home/stonewareslord/workspace/FullCourseManager/src:/home/stonewareslord/applications/java/junit-4.12.jar:/home/stonewareslord/applications/java/hamcrest-core-1.3.jar"
+"IndentGuides
 let g:indent_guides_start_level=1
 let g:indent_guides_guide_size=1
 let g:indent_guides_enable_on_vim_startup=1
-"let g:neocomplcache_enable_at_startup=1
-"let g:neocomplcache_enable_camel_case_completion=1
-"let g:neocomplcache_enable_smart_case=1
-"let g:neocomplcache_enable_underbar_completion=1
-"let g:neocomplcache_enable_auto_delimiter=1
-"let g:neocomplcache_max_list=20
-"let g:neocomplcache_force_overwrite_completefunc=1
-"let g:neocomplcache_min_syntax_length=2
-"let g:neocomplcache_enable_auto_select=1
-let g:neocomplete#enable_at_startup = 1
-let g:neocomplete#enable_smart_case = 1
-let g:neocomplete#sources#syntax#min_keyword_length = 2
 let g:php_refactor_command='php /usr/local/bin/refactor.phar'
-let g:ctrlp_extensions=['funky']
-"inoremap <expr><BS> neocomplcache#smart_close_popup()."\<C-h>"
-"function! g:UltiSnips_Complete()
-"  call UltiSnips#ExpandSnippet()
-"  if g:ulti_expand_res == 0
-"    if pumvisible()
-"      return "\<C-n>"
-"    else
-"      call UltiSnips#JumpForwards()
-"      if g:ulti_jump_forwards_res == 0
-"        return "\<TAB>"
-"      endif
-"    endif
-"  endif
-"  return ""
-"endfunction
-"au BufEnter * exec "inoremap <silent> " . g:UltiSnipsExpandTrigger . " <C-R>=g:UltiSnips_Complete()<cr>"
-"let g:UltiSnipsJumpForwardTrigger="<tab>"
-"let g:UltiSnipsListSnippets="<c-e>"
-"let g:UltiSnipsEditSplit="vertical"
+function! g:UltiSnips_Complete()
+  call UltiSnips#ExpandSnippet()
+  if g:ulti_expand_res == 0
+    if pumvisible()
+      return "\<C-n>"
+    else
+      call UltiSnips#JumpForwards()
+      if g:ulti_jump_forwards_res == 0
+        return "\<TAB>"
+      endif
+    endif
+  endif
+  return ""
+endfunction
+"inoremap <expr><Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
+"inoremap <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
+let g:UltiSnipsJumpForwardTrigger="<C-S-Q>"
+let g:UltiSnipsExpandTrigger="<S-Tab>"
+let g:UltiSnipsListSnippets="<C-e>"
+let g:UltiSnipsEditSplit="vertical"
+let g:ycm_key_list_select_completion = []
 inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
 let loaded_matchit=1
 filetype off
@@ -243,111 +245,98 @@ if has("win32")
 else
   call plug#begin('~/.vim/plugged')
 endif
-"Plug 'Floobits/floobits-vim'
-"Plug 'tsaleh/vim-matchit'
-"Plug 'Shougo/neosnippet'
-"Plug 'msanders/snipmate.vim'
-"Plug 'vim-scripts/YankRing.vim'
-Plug 'Chiel92/vim-autoformat'
-  "Adds autoformat command | https://github.com/Chiel92/vim-autoformat
-Plug 'tpope/vim-surround'
-  "Surround selection in ({\"' or HTML tags  | https://github.com/tpope/vim-surround
-Plug 'scrooloose/syntastic'
-  "Syntax checker | https://github.com/scrooloose/syntastic
-Plug 'nathanaelkane/vim-indent-guides'
-  "Indentation guides | https://github.com/nathanaelkane/vim-indent-guides
-Plug 'elzr/vim-json'
-  "JSON highlighting | https://github.com/elzr/vim-json
-Plug 'groenewege/vim-less'
-  "LESS highlighting | https://github.com/groenewege/vim-less
-Plug 'pangloss/vim-javascript'
-  "JS syntax and indentation | https://github.com/pangloss/vim-javascript
-"Plug 'Lokaltog/powerline-fonts'
-"  "Better powerline fonts | https://github.com/Lokaltog/powerline-fonts
-Plug 'bling/vim-airline'
-  "Bottom status bar | https://github.com/bling/vim-airline
-Plug 'terryma/vim-multiple-cursors'
-  "Multicursor functionality like Coda | https://github.com/terryma/vim-multiple-cursors
-Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
-  "File browser | https://github.com/scrooloose/nerdtree
-"Plug 'altercation/vim-colors-solarized'
-"  "Theme | https://github.com/altercation/vim-colors-solarized
-Plug 'stonewareslord/vim-colors'
-  "Theme pack | https://github.com/spf13/vim-colors
-"Plug 'spf13/PIV'
-"  "PHP tools | https://github.com/spf13/PIV
-"Plug 'vim-scripts/AutoTag'
-"  "Generates taglist with ctags | https://github.com/vim-scripts/AutoTag
-Plug 'Lokaltog/vim-easymotion'
-  "Move around quickly in a document | https://github.com/Lokaltog/vim-easymotion
-Plug 'sjl/gundo.vim'
-  "Visual undo | https://github.com/sjl/gundo.vim
-Plug 'tommcdo/vim-exchange'
-  "Exchange two selections of text | https://github.com/tommcdo/vim-exchange
-Plug 'tpope/vim-repeat'
-  "Repeat last tpope command with . | https://github.com/tpope/vim-repeat
-Plug 'tpope/vim-fugitive'
-  "Great Vim-Git compatibility | https://github.com/tpope/vim-fugitive
-Plug 'kien/ctrlp.vim'
-  "Fuzzy file search | https://github.com/kien/ctrlp.vim
-Plug 'godlygeek/tabular'
-  "Quickly make tables in vim | https://github.com/godlygeek/tabular
-"Plug 'tpope/vim-abolish'
-"  "Better abbrivation | https://github.com/tpope/vim-abolish
-Plug 'godlygeek/csapprox'
-  "256 color vim in terminal | https://github.com/godlygeek/csapprox
-"Plug 'sirver/UltiSnips'
-"  "Adds snippets | https://github.com/sirver/UltiSnips
-Plug 'honza/vim-snippets'
-  "More snippets | https://github.com/honza/vim-snippets
-Plug 'othree/eregex.vim'
-  "Real regexes in vim | https://github.com/othree/eregex.vim
-"Plug 'vim-scripts/sessionman.vim'
-"  "Session manager | https://github.com/vim-scripts/sessionman.vim
-Plug 'mattn/flappyvird-vim'
-  "The amazing Flappy Bird game | https://github.com/mattn/flappyvird-vim
-"Plug 'morhetz/gruvbox'
-"  "Colorscheme | https://github.com/morhetz/gruvbox
-Plug 'superbrothers/vim-vimperator'
-  "Vimperator for vim | https://github.com/superbrothers/vim-vimperator
-Plug 'Rykka/colorv.vim'
-  "Color selection in vim | https://github.com/Rykka/colorv.vim
-Plug 'mhinz/vim-signify'
-  "Git information inline | https://github.com/mhinz/vim-signify
-Plug 'jamessan/vim-gnupg'
-  "GPG support | https://github.com/jamessan/vim-gnupg
-Plug 'stonewareslord/zeavim.vim'
-  "Zeal support | https://github.com/stonewareslord/zeavim.vim
-Plug 'vim-scripts/DirDiff.vim'
-  "Directory diff | https://github.com/vim-scripts/DirDiff.vim
-Plug 'vim-scripts/DoxygenToolkit.vim'
-  "Doxygen | https://github.com/vim-scripts/DoxygenToolkit.vim
-Plug 'vim-scripts/SyntaxRange'
-  "Range of syntaxes | https://github.com/vim-scripts/SyntaxRange
-Plug 'PotatoesMaster/i3-vim-syntax'
-  "i3 syntax | https://github.com/PotatoesMaster/i3-vim-syntax
-Plug 'https://github.com/fatih/vim-go'
-  "go syntax | https://github.com/fatih/vim-go
-"Plug 'https://github.com/kien/rainbow_parentheses.vim'
-"  "Colored parenthesis | https://github.com/kien/rainbow_parentheses.vim
-Plug 'https://github.com/jiangmiao/auto-pairs'
-  "Automatic pairs | https://github.com/jiangmiao/auto-pairs
-Plug 'https://github.com/Valloric/YouCompleteMe'
-"  "Autocompletion | https://github.com/Valloric/YouCompleteMe
-Plug 'https://github.com/evidens/vim-twig'
-  "Twig highlighting | https://github.com/evidens/vim-twig
-Plug 'https://github.com/joonty/vdebug'
-  "Php debugging | https://github.com/joonty/vdebug
-Plug 'https://github.com/zenbro/mirror.vim'
-  "Edit files remotely | https://github.com/zenbro/mirror.vim
-Plug 'https://github.com/xolox/vim-easytags'
-  "Vim tags | https://github.com/xolox/vim-easytags
-Plug 'https://github.com/xolox/vim-misc'
-  "Misc (required for easytags) | https://github.com/xolox/vim-misc
-Plug 'https://github.com/lervag/vimtex'
-  " | https://github.com/lervag/vimtex
-Plug 'https://github.com/habamax/vim-skipit'
-  " | https://github.com/habamax/vim-skipit
+" Code writing {
+  Plug 'Chiel92/vim-autoformat'
+    "Adds autoformat command | https://github.com/Chiel92/vim-autoformat
+  Plug 'tpope/vim-surround'
+    "Surround selection in ({\"' or HTML tags  | https://github.com/tpope/vim-surround
+  Plug 'scrooloose/syntastic'
+    "Syntax checker | https://github.com/scrooloose/syntastic
+  Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
+    "File browser | https://github.com/scrooloose/nerdtree
+  Plug 'Lokaltog/vim-easymotion'
+    "Move around quickly in a document | https://github.com/Lokaltog/vim-easymotion
+  Plug 'sjl/gundo.vim', { 'on': 'GundoToggle' }
+    "Visual undo | https://github.com/sjl/gundo.vim
+  Plug 'tommcdo/vim-exchange'
+    "Exchange two selections of text | https://github.com/tommcdo/vim-exchange
+  Plug 'tpope/vim-repeat'
+    "Repeat last tpope command with . | https://github.com/tpope/vim-repeat
+  Plug 'tpope/vim-fugitive'
+    "Great Vim-Git compatibility | https://github.com/tpope/vim-fugitive
+  Plug 'kien/ctrlp.vim'
+    "Fuzzy file search | https://github.com/kien/ctrlp.vim
+  Plug 'godlygeek/tabular'
+    "Quickly make tables in vim | https://github.com/godlygeek/tabular
+  Plug 'sirver/UltiSnips'
+  "  "Adds snippets | https://github.com/sirver/UltiSnips
+  Plug 'honza/vim-snippets'
+    "More snippets | https://github.com/honza/vim-snippets
+  Plug 'othree/eregex.vim'
+    "Real regexes in vim | https://github.com/othree/eregex.vim
+  Plug 'Rykka/colorv.vim'
+    "Color selection in vim | https://github.com/Rykka/colorv.vim
+  Plug 'vim-scripts/DoxygenToolkit.vim'
+    "Doxygen | https://github.com/vim-scripts/DoxygenToolkit.vim
+  Plug 'mhinz/vim-signify'
+    "Git information inline | https://github.com/mhinz/vim-signify
+  Plug 'https://github.com/jiangmiao/auto-pairs'
+    "Automatic pairs | https://github.com/jiangmiao/auto-pairs
+  Plug 'https://github.com/Valloric/YouCompleteMe'
+  "  "Autocompletion | https://github.com/Valloric/YouCompleteMe
+  Plug 'https://github.com/joonty/vdebug'
+    "Php debugging | https://github.com/joonty/vdebug
+  Plug 'https://github.com/zenbro/mirror.vim'
+    "Edit files remotely | https://github.com/zenbro/mirror.vim
+  Plug 'https://github.com/xolox/vim-easytags'
+    "Vim tags | https://github.com/xolox/vim-easytags
+  Plug 'https://github.com/xolox/vim-misc'
+    "Misc (required for easytags) | https://github.com/xolox/vim-misc
+  Plug 'https://austenwares.com/gogs/stonewareslord/vim-java-getset.git'
+    "Java getters and setters| gogs@austenwares.com:stonewareslord/vim-java-getset.git
+  Plug 'https://github.com/majutsushi/tagbar'
+    " | https://github.com/majutsushi/tagbar
+  " }
+" Style {
+  Plug 'nathanaelkane/vim-indent-guides'
+    "Indentation guides | https://github.com/nathanaelkane/vim-indent-guides
+  Plug 'bling/vim-airline'
+    "Bottom status bar | https://github.com/bling/vim-airline
+  Plug 'stonewareslord/vim-colors'
+    "Theme pack | https://github.com/spf13/vim-colors
+  Plug 'godlygeek/csapprox'
+    "256 color vim in terminal | https://github.com/godlygeek/csapprox
+  " }
+" Syntax {
+  Plug 'elzr/vim-json'
+    "JSON highlighting | https://github.com/elzr/vim-json
+  Plug 'groenewege/vim-less'
+    "LESS highlighting | https://github.com/groenewege/vim-less
+  Plug 'pangloss/vim-javascript'
+    "JS syntax and indentation | https://github.com/pangloss/vim-javascript
+  Plug 'superbrothers/vim-vimperator'
+    "Vimperator for vim | https://github.com/superbrothers/vim-vimperator
+  Plug 'PotatoesMaster/i3-vim-syntax'
+    "i3 syntax | https://github.com/PotatoesMaster/i3-vim-syntax
+  Plug 'https://github.com/fatih/vim-go'
+    "go syntax | https://github.com/fatih/vim-go
+  Plug 'https://github.com/evidens/vim-twig'
+    "Twig highlighting | https://github.com/evidens/vim-twig
+  " }
+" Misc {
+  Plug 'mattn/flappyvird-vim'
+    "The amazing Flappy Bird game | https://github.com/mattn/flappyvird-vim
+  Plug 'jamessan/vim-gnupg'
+    "GPG support | https://github.com/jamessan/vim-gnupg
+" }
+" Unused {
+  "Plug 'vim-scripts/DirDiff.vim'
+    "Directory diff | https://github.com/vim-scripts/DirDiff.vim
+  "Plug 'https://github.com/kien/rainbow_parentheses.vim'
+  "  "Colored parenthesis | https://github.com/kien/rainbow_parentheses.vim
+  "Plug 'vim-scripts/SyntaxRange'
+    "Range of syntaxes | https://github.com/vim-scripts/SyntaxRange
+" }
 call plug#end()
 filetype plugin indent on
 if exists("+undofile")
@@ -380,7 +369,6 @@ else
   "colorscheme torte
 endif
 silent! colorscheme fruity
-nnoremap <Leader>W :%s/\s\+$//<cr>:let @/=''<cr>
 function! Initialize()
   if has("win32")
     if empty(glob("~/_vim/autoload/plug.vim"))
@@ -419,3 +407,6 @@ endfunction
         \ 're!\\[A-Za-z]*(ref|cite)[A-Za-z]*([^]]*])?{([^}]*, ?)*'
         \ ]
 set guifont=Fixed\ Medium\ Semi-Condensed\ 10
+inoremap <Tab> <C-R>=g:UltiSnips_Complete()<cr>
+map <unique> <buffer> <LocalLeader>b <Plug>JavagetsetInsertBothGetterSetter
+map <Leader>a m":Autoformat<CR>:%S/\n\n+/\r/<CR>`"