update bash
Merge branch 'master' of da0shi.dev:/var/lib/git/dotfiles

Conflicts:
	bash/.bash_profile
update gitignore to ignore all *.vim files
Merge branch 'master' of da0shi.dev:/var/lib/git/dotfiles