Added --branches option to git log alias
Updated kaleidoscope git settings
Merge branch 'master' of github.com:zanneth/DotZanneth into workstation