Update gitignore.
Clean up.
Update gitignore.
Fix build.
Merge remote-tracking branch 'origin/master'
Fix build on OS X.
Fix build for OS X and Linux.