~ deletion
Merge branch 'master' of http://github.com/xhoskin/vim-new
copy filenames
fix conflict