updating gitignore, preparing to merge in changes.