vimrc, vimrc_old remove
Merge branches 'master' and 'master-0.0.1' into master-0.0.1