changed git merge to meld
export editor set to vim and move ruby path