Merge remote-tracking branch 'origin/dev' into dev

2 files changed, 3 insertions, 2 deletions

diff --git a/alias b/alias
index ec58527..00683e4 100644
--- a/alias
+++ b/alias
@@ -368,6 +368,7 @@ alias cdma='cd ~/git/mapstew-android'
 alias cdT='cd ~/git/tilemaker'
 alias cdssh='cd ~/.ssh'
 alias cdpass='cd ~/.password-store'
+alias cdngx='cd /etc/nginx'
 alias stew='cd ~/git/mapstew'
 alias chmodx='sudo chmod +x'
 
diff --git a/vimrc b/vimrc
index 1de8afd..2a15d63 100644
--- a/vimrc
+++ b/vimrc
@@ -33,8 +33,8 @@ nnoremap <leader>R :read !
 nnoremap <leader>P :r !xsel -ob<CR>
 
 " move
-nnoremap <Tab> }
-nnoremap <S-Tab> {
+" nnoremap <Tab> }
+" nnoremap <S-Tab> {
 inoremap <C-L> <Right>
 cnoremap <C-L> <Right>
 cnoremap <C-H> <Left>