Commit 61e8fb1

@@ -1,2 +1,1 @@
-"autocmd!
 autocmd FileType vim setlocal foldmethod=marker

@@ -6,6 +6,7 @@ set autoread
 set autowrite
 set backspace=indent,eol,start
 set backupdir=~/tmp,/var/tmp,/tmp/
+set foldmethod=marker
 set clipboard^=unnamed,unnamedplus
 set cmdheight=1
 set completeopt=menu,preview
@@ -83,13 +84,29 @@ if has("termguicolors")
   set termguicolors
 endif
 
+if has("statusline") && !&cp
+  set laststatus=2
+  set statusline=%f
+  set statusline+=\ -\
+  set statusline+=%y
+  set statusline+=%=
+  set statusline+=[buffer:%02n]
+  set statusline+=[column:%02v]
+  set statusline+=[line:%04l
+  set statusline+=/
+  set statusline+=%04L]
+  set statusline+=%#warningmsg#
+  set statusline+=%{SyntasticStatuslineFlag()}
+  set statusline+=%*
+endif
+
 runtime macros/matchit.vim
 color happy_hacking
 syntax on
 
 " }}}}
 
-"" File type-specific settings {{{{
+"" File Type Settings {{{{
 ""
 
 filetype plugin indent on
@@ -103,19 +120,8 @@ if has("autocmd")
 endif
 
 " }}}}
-"
-"" Command-Line Mappings {{{{
-""
-
-" After whitespace, insert the current directory into a command-line path
-cnoremap <expr> <C-P> getcmdline()[getcmdpos()-2] ==# ' ' ? expand('%:p:h') : "\<C-P>"
-
-" Kills Trailing Whitespaces
-command! KillWhitespace :normal :%s/ *$//g<cr><c-o><cr>
-
-" }}}
 
-"" General Mappings (Normal, Visual, Operator-pending) {{{{
+"" Mappings {{{{
 ""
 
 let mapleader = ","
@@ -179,27 +185,6 @@ omap <leader><tab> <plug>(fzf-maps-o)
 xmap <leader><tab> <plug>(fzf-maps-x)
 " }}}}
 
-"" Status Line {{{{
-""
-
-if has("statusline") && !&cp
-  set laststatus=2
-  set statusline=%f
-  set statusline+=\ -\
-  set statusline+=%y
-  set statusline+=%=
-  set statusline+=[buffer:%02n]
-  set statusline+=[column:%02v]
-  set statusline+=[line:%04l
-  set statusline+=/
-  set statusline+=%04L]
-  set statusline+=%#warningmsg#
-  set statusline+=%{SyntasticStatuslineFlag()}
-  set statusline+=%*
-endif
-
-" }}}}
-
 "" Abbreviations {{{{
 ""