Merged changes from Jocelyn and from Kim.  Need to add figures, repair poor quality figures, and merge bibliographies.

BB