diff --git a/shells/zshrc b/shells/zshrc
index f0240be..8e2d61c 100644
--- a/shells/zshrc
+++ b/shells/zshrc
@@ -270,6 +270,7 @@ pub-git-init(){
   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"
 }
@@ -278,6 +279,7 @@ pub-git-rm(){
     git remote rm local
     git remote rm ncsu
     git remote rm gitlab
+    git remote rm aws
   fi
   while (( $# > 0 )) ; do
     git remote rm "$1"
@@ -289,6 +291,7 @@ pub-git-push(){
     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
@@ -300,6 +303,7 @@ pub-git-clone(){
     ncsu)   remote="gcrypt::git@github.ncsu.edu:agadler/a86a0f8757772be2ec617b395a0716679bfce51c1bfdeb8da6127feebd84facde645e9e30188318344eb458f5834e3d86800.git#" ;;
     gitlab) remote="gcrypt::git@gitlab.com:stonewareslord/e6e03ea006d55de0970a28bcb7fcf65f4c66f98f50830bd69b50c5dc502bdf1a4e4172187cfb5fcef8c32bd7fb316bdc67d7d86713ebfe232f97eb303ac316ae.git#" ;;
     local)  remote="gcrypt::git@localhost:stonewareslord/79a79b1a6e37813d9226872c6428aca29eec9f6111558109861cb0dcd2f0ffc8198deea4e361f84e170989212452fdfb21e0ef690da2ad399c03ce308d79dcfe#" ;;
+    aws)  remote="gcrypt::git@aws:stonewareslord/5e0701d5b5b2118127d378c084be9a1dfb33d185d3e2c5da30a3984f5118e3d5136f3f3b038462bccd538e93f9e32cb06136.git#" ;;
     *)      echo "Opts: local ncsu gitlab" ; return 1
   esac
   shift
@@ -383,3 +387,4 @@ 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 1947eb1..56d25eb 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -99,9 +99,9 @@ let g:tex_flavor='latex'
   "Gundo
   nnoremap <F5> :GundoToggle<CR>
   "Easytags
-  "nnoremap <Leader><Space> :CtrlPTag<CR>
+  nnoremap <Leader><Space> :CtrlPTag<CR>
   "Tagbar
-  nnoremap <Leader><Space> :Tagbar<CR>
+  "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
@@ -179,14 +179,18 @@ let g:tex_flavor='latex'
   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
@@ -196,6 +200,7 @@ 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']
@@ -204,15 +209,15 @@ 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: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:php_refactor_command='php /usr/local/bin/refactor.phar'
-let g:ctrlp_extensions=['funky']
 function! g:UltiSnips_Complete()
   call UltiSnips#ExpandSnippet()
-  echo "Test"
   if g:ulti_expand_res == 0
     if pumvisible()
       return "\<C-n>"
@@ -227,7 +232,7 @@ function! g:UltiSnips_Complete()
 endfunction
 "inoremap <expr><Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
 "inoremap <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
-let g:UltiSnipsJumpForwardTrigger="<Tab>"
+let g:UltiSnipsJumpForwardTrigger="<C-S-Q>"
 let g:UltiSnipsExpandTrigger="<S-Tab>"
 let g:UltiSnipsListSnippets="<C-e>"
 let g:UltiSnipsEditSplit="vertical"
@@ -287,7 +292,7 @@ endif
     "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 'gaw:stonewareslord/vim-java-getset.git'
+  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
@@ -403,3 +408,5 @@ endfunction
         \ ]
 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>`"