diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1377554
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.swp
diff --git a/vimrc b/vimrc
index c6904ff..f266ad7 100644
--- a/vimrc
+++ b/vimrc
@@ -1,31 +1,25 @@
-" -- Vundle Config --
-source ~/.vim/.vimrc-vundle
+" -- Settings --------------------------------------------
+set lbr " automatically wraps text
+set formatoptions=l " prevents the breaking up of words
+set breakindent " indent for single-line wrap
+set breakindentopt=shift:3 " indent amout for single-line wrap
 
-" -- Plugin Config --
-source ~/.vim/.vimrc-myPlugins
+let &t_Co=256 " use 256-color
 
-" -- Smart, Single-line Indentation --
-	set breakindent
-	set breakindentopt=shift:3
-	" prevents the breaking up of words
-	set formatoptions=l
-	set lbr
+set number " show line numbers
+syntax on " detect syntax
+set autoindent " match indentation with next line
+set smartindent " match indentation with syntax
 
-" -- Colorscheme Configuration --
-	let &t_Co=256
-	colorscheme tigrana-256-dark
+set spelllang=en " spell check language is english
+set spellfile=$RC_DIR/en.utf-8.add " spell file
 
-" -- General --
-	set number
-	syntax on
-	set autoindent
-	set smartindent
-	set spelllang=en
-	set spellfile=$HOME/en.utf-8.add
 
-" -- quick run macro recorded to q:
-	:nnoremap <Space> @q
+" -- Key bindings ----------------------------------------
 
-" -- execute current line as shell command
-	:noremap Q !!$SHELL<CR>
-	:vnoremap Q !$SHELL<CR>
+" <SPACE> to execute macro on q
+:nnoremap <Space> @q
+
+" Q to replace current line/selection with bash execution
+:noremap Q !!$SHELL<CR>
+:vnoremap Q !$SHELL<CR>