remove .DS_Store
add .gitignore, modified .vimrc
modified .vimrc (neocomplete)
merge files