Set pretty print to oneline
Set colorui mode to true
Merge branch 'master' of http://github.com/c0state/dotfiles

Conflicts:
	.gitconfig-base