bash: Add HISTCONTROL
git: Add IntelliJ and Windows files to global ignore
vim: Add status line
Merge remote-tracking branch 'origin/master'

Conflicts:
	git/gitignore