Alias rm for rm -i
Merge branch 'master' of github.com:giginet/dotfiles

Conflicts:
	vim/vim/.netrwhist
	vim/vim/neobundles.vim
Remove unused files