take new commits of implicit-git-rm
use implicit-git-rm
remove conflict mark
fix PS1

__git_ps1 is loaded when calling . /etc/bash_completion
update Implicit-git-rm
update .gitignore
update implicit git rm
Merge branch 'master' of github.private:kakkun61/dot_files

Conflicts:
	.bashrc
diff-highlighted
Merge branch 'master' into mac