Update .bashrc and .vimrc
Merge branch 'master' of https://github.com/application-developer-DA/dot-files

Conflicts:
	.vimrc