More edits and tweaks.
Merge branch 'master' of https://github.com/colinbdclark/flocking-papers
small edits and some formatting