Merge branch 'master' of github.com:DarkWiiPlayer/darkrc

Conflicts:
	vimrc

vimrc

@@ -110,6 +110,12 @@ endif
 
 
 " CUSTOM STUFF
+noremap <space> :
+noremap <C-space> @:
+noremap <C-s> :w<enter>
+noremap <C-x> :bdelete<enter>
+noremap <C-n> :bnext<enter>
+noremap <C-p> :bprevious<enter>
 set bg=dark
 set number
 " Filetype stuff
@@ -121,19 +127,33 @@ set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab
 set t_Co=256
 " Remapping some things
 vmap <C-f> :fold<CR>
+<<<<<<< HEAD
 " nmap <C-b> :bprevious<CR>
 noremap <space> :
 nnoremap <C-s> :w<enter>
 nnoremap <C-x> :bdelete<enter>
 nnoremap <C-n> :bnext<enter>
 nnoremap <C-p> :bprevious<enter>
+=======
+>>>>>>> 621eebbe99c4cf7a82a1ee8875b122be5b59cff4
 " Retab mappings
 nnoremap <S-tab> :retab!<enter>
-nnoremap <S-tab><S-tab> :setl expandtab!<enter> :set expandtab?<enter>
-" Unprintable Characters
+nnoremap <S-tab><S-tab> :setl expandtab!<enter>:set expandtab?<enter>
+noremap <F1> :setl number!<enter>
+noremap <F2> :setl relativenumber!<enter>
+noremap <F3> :setl autowriteall!<enter>:setl autowriteall?<enter>
 noremap <F4> :setl list!<enter>
-noremap <F3> :setl number!<enter>
 set listchars=eol:¶,tab:»\ ,trail:.
+set showbreak=+->\
 " Commands
 com! Setwd :cd %:p:h
 com! Removetrailingspaces :%s/\ \+$//ge
+nmap <leader>t :Removetrailingspaces<enter>
+set statusline=(%n)\ %f\ [%M%R]\ [%Y]%=%l,%c%V\ %4.P
+set laststatus=2
+set cmdheight=1
+set winheight=10
+set winminheight=4
+set winheight=9999
+set timeoutlen=300
+let mapleader = "\\"