comments
Merge remote-tracking branch 'origin/master'
avoid config explosion on older git
two finger touchpad scrolling (in "natural" direction, like OSX)
gvb (and better less options - will they work on mac?)
let's try magenta constants for a while
Merge remote-tracking branch 'origin/master'
Merged remote-tracking branch 'origin/master'
comment
gZ for forgetful me
notes for git_get_current_branch - cannot get branch name during incomplete rebase
comments
Removed an exclude from grep searches
Merge branch 'master' into mac_compat

Conflicts:
	.vimrc