Move FISH_BUILD_VERSION from osx/config.h to the pbxproj so that we can build with the generated config.h
Fix "." function to not shadow scopes, so the tests pass again. Remove eval's use of "." function.
Actually commit the no-scope-shadowing to . function
Merge remote-tracking branch 'upstream/master'