updating to latest from John.  added gitignore