[git] switch push strategy to matching
Add commit messages to merge commits
Clean up format, add github username and url aliases to global config
Add OS X Desktop setup script (initial setup)