Two fixes for the gtest formula

This fixes two issues with the gtest formula.

First, it pulls in the fix from this issue on homebrew:
https://github.com/Homebrew/homebrew/issues/7009

Second, it removes an extra + in the diff that caused ```gtest_port.h``` to have a 
```
+namespace std {
```
in it after patching.