Updated Git to 1.8.1.3
Updated app publisher and homepage
Resolve merge conflicts