modify vimrc
Merge remote-tracking branch 'origin/PC' into NB
Add auto-pairs and smarkword
aa
Merge remote-tracking branch 'origin/NB' into PC
1. add colorscheme

2. modify vimrc
3. remove matlab and python syntax files
add matlab syntax support
remove rainbow, smartword

modify vividchalk colorscheme
aa
Merge remote-tracking branch 'origin/NB' into PC

Conflicts:
	vimrc
remove auto-pair plugin
add auto-pair

add a trick for auto formatting text
modify vimrc