switch mvim
grh can take a branch, defaults to HEAD
sshuttle home
ec2 things
Merge remote-tracking branch 'origin/master'
latest
Merge remote-tracking branch 'origin/master'

Conflicts:
	custom/aliases.zsh
	custom/git.zsh