Added idea settings
Added more shellcolors and fixed line wrap problem in prompt
Added .git config gloval
Aesthetics
Merge branch 'master' of https://github.com/NickCody/dotfiles

Conflicts:
	dotbashrc