20141112 merge master
[.zshrc.prompt] refine my code
Merge branch 'zshrc'