Fix build on xcode 5.1. See comment for more info.

Might as well fix up .gitignore while here.