Merge branch 'master' of github.com:cinaeco/dotFiles

screen/screenrc

@@ -78,7 +78,7 @@ vbell_msg             " *beep* "
 screen -t "controllers" 1
 screen -t "views" 2
 screen -t "models" 3
-screen -t "partials" 4
+screen -t "routes" 4
 screen -t "javascript" 5
 screen -t "libraries" 6
 screen -t "logs" 7

vim/vimrc

@@ -139,10 +139,15 @@ imap II <Esc>
 nmap <leader>j o<Esc>k
 nmap <leader>k O<Esc>j
 
+" Toggle numbering
+nmap <silent> <leader>n    :set number!<CR>
+
 " Toggle NERDTree instead of the normal dir browser
-nmap <silent> <leader>d   :NERDTreeToggle<CR>
+nnoremap <silent> <leader>d    :NERDTreeToggle<CR>
 
-" Comment out lines with NERDCommenter
+" Toggle Commenting out lines with NERDCommenter
+nnoremap <silent> <leader>,    :call NERDComment(0, "toggle")<CR>
+vnoremap <silent> <leader>,    <ESC>:call NERDComment(1, "toggle")<CR>
 
 " Edit .vimrc
 map <leader>v   :e $MYVIMRC<CR>
@@ -151,6 +156,10 @@ map <leader>v   :e $MYVIMRC<CR>
 "" Key Remaps - Movement and Windows
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""
 
+" jump to beginning and end of line easier
+nmap H ^
+nmap L $
+
 " Smart way to move btw. windows
 map <C-j> <C-W>j
 map <C-k> <C-W>k
@@ -186,4 +195,4 @@ nnoremap <silent> <expr> ^ ScreenMovement("^")
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""
 
 " let g:NERDTreeQuitOnOpen = 1
-let g:SuperTabDefaultCompletionType = "context"
+" let g:SuperTabDefaultCompletionType = "context"