Added diff/merge tool
Added gvm startup script