global gitignore: Add deploy/
Merge remote-tracking branch 'origin/master' into mac