Temporary fix for gem/brew with XCode 5.1, plus changes to jv