Fix problem with Java heap options
Add editor to gitconfig