Removido .NERDTreeBookmarks dos arquivos
Merge branch 'master' of https://github.com/mateusduboli/configs

Conflicts:
	dotfiles/vim/.NERDTreeBookmarks
	setup