set exec bit on ./dot and merge vim config

dot

@@ -1,3 +1,6 @@
+unlet! skip_defaults_vim
+runtime defaults.vim
+
 " To make 3rd party includes
 set foldmethod=marker
 
@@ -33,17 +36,21 @@ set ruler
 " }}}
 
 " Spaces instead of TABs :( {{{
-set expandtab
+set expandtab       " Use spaces instead of tab characters
 set shiftround
-set shiftwidth=4
-set softtabstop=-1 " When 'sts' is negative, the value of 'shiftwidth' is used.
-set tabstop=6      " Make TAB char more obvious
+set shiftwidth=4    " Number of spaces to use for each step of (auto)indent
+set softtabstop=4   " Number of spaces that a Tab key press is equivalent to
+set softtabstop=-1  " When 'sts' is negative, the value of 'shiftwidth' is used.
+set tabstop=6       " Make TAB char more obvious
+set tabstop=6       " Number of spaces that a tab character represents
 " }}}
 
 " }}}
 
 " Feels {{{
 
+set iskeyword-=_    " Don't skip over _
+
 " Search subdirectories
 " Provides tab-complete for all file-related tasks
 set path+=**