Update 'git purr' to keep merges
Remove duplicate entry 'ready'
Update ribbon aliases to work with remote branches named different than local branches