enable vim text folding
fix conflict on vimrc
merge vimrc
add powerline to vim