.DS_Store on gitignore
new vim plugins, new vim configuration
Merge branch 'master' of github.com:dmpinheiro/dmpinheiro

Conflicts:
	vim/.vundlerc
	vim/gvimrc
	vim/vimrc