put markers in vimrc and reorganize
merge origin master