Use kaleidoscope as git merge/diff tool.
Increase default maven perm gen size.