Pull Latest Changes from Square

Don't think this will change my issues with the Homebrew install task though.