Further updates...

Sorry this is taking so long... teaching three classes and advising 4
thesis students just doesn't leave a whole lot of free time...
Merge remote-tracking branch 'origin/master'

Conflicts:
	cgang/flow.tex