diff --git a/bundle/vim-trailing-whitespace b/bundle/vim-trailing-whitespace
new file mode 160000
index 0000000..d4ad27d
--- /dev/null
+++ b/bundle/vim-trailing-whitespace
@@ -0,0 +1 @@
+Subproject commit d4ad27de051848e544e360482bdf076b154de0c1
diff --git a/vimrc b/vimrc
index a3871f5..c34f2f3 100644
--- a/vimrc
+++ b/vimrc
@@ -31,7 +31,7 @@ Plugin 'whatyouhide/vim-gotham'
 Plugin 'MarcWeber/vim-addon-mw-utils'
 Plugin 'tomtom/tlib_vim'
 Plugin 'garbas/vim-snipmate'
-
+Plugin 'bronson/vim-trailing-whitespace'
 
 """"""""""""""""""""""""""""""
 " vim-powerline symbols
@@ -42,9 +42,6 @@ let g:airline_left_sep = '⮀'
 let g:airline_left_alt_sep = '⮁'
 let g:airline_right_sep = '⮂'
 let g:airline_right_alt_sep = '⮃'
-let g:airline_symbols.branch = '⭠'
-let g:airline_symbols.readonly = '⭤'
-let g:airline_symbols.linenr = '⭡'
 
 
 "tagbar related settings
@@ -224,4 +221,19 @@ autocmd FileType html set sw=2
 autocmd FileType html set ts=2
 autocmd FileType html set sts=2
 
+" No backup
+set nobackup
+set noswapfile
+
+" Paste large amount of text in vim
+set pastetoggle=<F2>
+
+" Save key stroke
+nnoremap ; :
+
+" Space the final frontier
+let mapleader = "\<Space>"
+
+nnoremap <Leader>o :CtrlP<CR>
+nnoremap <Leader>w :w<CR>