diff --git a/.vimrc b/.vimrc
index 164abc66..66644aeb 100755
--- a/.vimrc
+++ b/.vimrc
@@ -1,5 +1,6 @@
 "golang
-"
+"Processing... % (ctrl+c to stop)
+let g:fencview_autodetect=0
 set rtp+=$GOROOT/misc/vim
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " 显示相关  
@@ -70,6 +71,9 @@ au BufRead,BufNewFile *.{go}   set filetype=go
 nmap md :!~/.vim/markdown.pl % > %.html <CR><CR>
 nmap fi :!firefox %.html & <CR><CR>
 
+"将tab替换为空格
+nmap tt :%s/\t/    /g<CR>
+
 
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -132,8 +136,9 @@ map! <C-Z> <Esc>zzi
 map! <C-O> <C-Y>,
 map <C-A> ggVG$"+y
 map <F12> gg=G
+imap <C-k> <C-y>,
 " 选中状态下 Ctrl+c 复制
-map <C-v> "*pa
+"map <C-v> "*pa
 imap <C-v> <Esc>"*pa
 imap <C-a> <Esc>^
 imap <C-e> <Esc>$
diff --git a/.zshrc b/.zshrc
index 7266b6c4..30dbfd3a 100755
--- a/.zshrc
+++ b/.zshrc
@@ -12,7 +12,7 @@ FINISH="%{$terminfo[sgr0]%}"
  
 #命令提示符
 RPROMPT=$(echo "$RED%D %T$FINISH")
-PROMPT=$(echo "~~$GREEN%/$_YELLOW>>$FINISH ")
+PROMPT=$(echo "@$GREEN%/$_YELLOW\$ $FINISH")
 
 #RPROMPT=$(echo "$RED%D %T$FINISH")
 #PROMPT=$(echo "$CYAN%n@$YELLOW%M:$GREEN%/$_YELLOW>$FINISH ")
@@ -26,7 +26,11 @@ preexec () { print -Pn "\e]0;%n@%M//%/\ $1\a" }
 ;;
 esac
 #}}}
- 
+
+#python startup
+export PYTHONSTARTUP="/home/ma6174/.pythonstartup"
+
+#current path-directories
 #编辑器
 export EDITOR=vim
 #输入法
@@ -244,8 +248,21 @@ alias y='yaourt'
 alias h='htop'
 alias vim='sudo vim'
 alias sshacm='ssh acmxs@210.44.176.195'
+alias sshdb='ssh db@210.44.176.195 -p 23'
 alias sshsys='ssh ma6174@211.64.20.43 -X'
+alias fqr="ssh -TfnN -D 7071 512c1f5d500446d56a00009c@py-ma6174.rhcloud.com"
+alias fq='ssh -TfnN -D 7070 -p 3843 winston@27.120.120.5'
 alias l='ls'
+alias b='bpython'
+alias pi='ssh pi@192.168.1.106'
+alias sl='sl -e'
+alias fileftp='python -m SimpleHTTPServer'
+alias r='ranger'
+alias i='sudo apt-get install -y'
+alias gita='git add . && git commit -a'
+alias t='tmux'
+alias ta='tmux a -t 0'
+alias news="newsbeuter"
  
 #[Esc][h] man 当前命令时，显示简短说明
 alias run-help >&/dev/null && unalias run-help
@@ -339,3 +356,4 @@ check-cmd-self-insert() { zle .self-insert && recolor-cmd }
  
  zle -N self-insert check-cmd-self-insert
  zle -N backward-delete-char check-cmd-backward-delete-char
+export PATH=$HOME/.cabal/bin:$PATH
diff --git a/README.md b/README.md
index d543d8fc..62420fa5 100755
--- a/README.md
+++ b/README.md
@@ -15,6 +15,12 @@
 - clone bundle 程序：`git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle`
 - 打开vim并执行bundle程序`:BundleInstall`
 
+## 2013年5月10日更新
+
+- 修复关闭html一直提示"Processing... % (ctrl+c to stop)bug
+- 修改zencoding快捷键，`ctrl+k`展开
+- 增加javascript插件
+
 ## 2013年4月3日更新
 
 1. 完善安装方法，修复bundle问题
diff --git a/bundle/Better-Javascript-Indentation b/bundle/Better-Javascript-Indentation
new file mode 160000
index 00000000..c624edbc
--- /dev/null
+++ b/bundle/Better-Javascript-Indentation
@@ -0,0 +1 @@
+Subproject commit c624edbcb46ac0cc45b1b8dee2477d67c9b5b7df
diff --git a/bundle/Javascript-Indentation b/bundle/Javascript-Indentation
new file mode 160000
index 00000000..3e5a6716
--- /dev/null
+++ b/bundle/Javascript-Indentation
@@ -0,0 +1 @@
+Subproject commit 3e5a6716e6e596df98b66b5f12d05d72ccc02358
diff --git a/bundle/javascript.vim b/bundle/javascript.vim
new file mode 160000
index 00000000..ba362a72
--- /dev/null
+++ b/bundle/javascript.vim
@@ -0,0 +1 @@
+Subproject commit ba362a7278c8a26a216f2107389390b85ea5dba2