Script to cherry-pick from another git repository
Typo
Use colordiff
Script to open pull request, etc. at Bitbucket
Simple error handling
Don't keep git conflict backups
Better grep options
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bashrc
Clean up aliases
Use colordiff wrapper
Simplify brew install script