20141112 merge master
20141112 merge master
20141112 merge master
[.zshrc.prompt] refine my code
Merge branch 'zshrc'
[.vim][rst.vim] no more recognize "aaaaa" as title
[.vim][rst.vim] add ``<``, ``>`` to indent a line
[.vim][todo.vim] add ``<`` ``>`` to indent a line
Merge branch 'rst'
Merge branch 'todo.vim'
Merge branch 'master' into develop