Trying to win my struggle with git.

Checked out a fresh copy and then moved in my changes of today.

Signed-off-by: David Brainard <brainard@psych.upenn.edu>