Set default editor to vim since most people work on dev
Move filesync alias to top
Add conflict resolutions in 'rbc' alias
Add example workflow