dict mapping for Python
modify braces
Merge branch 'vimrc'