Add comments. Notes re Vim mode on C9
Add my_junk discussion of fast-forward updates
Fixed conflicts with my_junk. There have been a few.