merged bender and calculon .vomrc file.

.vimrc

@@ -38,6 +38,9 @@ filetype plugin indent on
 "runtime! macros/matchit.vim
 "inoremap <C-U> <C-G>u<C-U>
 
+set backupdir=$HOME/.vim/backup_files//
+set directory=$HOME/.vim/swap_files//
+set undodir=$HOME/.vim/undo_files//
 
 " Use Syntastic https://github.com/vim-syntastic/syntastic
 " for syntax checks.
@@ -99,17 +102,14 @@ set noswapfile
 
 set expandtab
 
-set shiftwidth=4
-set tabstop=4
-
 set lbr
 set tw=500
 
 set smartindent
 set wrap
 
-"map <silent> <leader><cr> :noh<cr>
 
+" Keybindings
 map <leader>l :bnext<cr>
 map <leader>h :bprev<cr>
 
@@ -124,3 +124,15 @@ set statusline=\ %F%m%r%h\ %w\ \ CWD:\ %r%{getcwd()}%h\ \ \ Line:\ %l\ \ Column:
 map 0 ^
 
 
+set gdefault
+
+set number
+
+set background=dark
+
+set ffs=unix,dos,mac
+
+" Indentation
+set shiftwidth=2
+set softtabstop=2
+