git and ansible alias
Multiline prompt
Fix left scroll bar
Just list, dont remove
Codeblocks Stuff
Merge branch 'master' of github.com:markpitchless/home

Conflicts:
	.codeblocks/cbKeyBinder10.ini
	.codeblocks/cbKeyBinder10.ini.bak
	.codeblocks/default.conf