Combined Eclipse stuff with git stuff