Fix evil bug in 'gsq'.
Add alias for git merge ('gm').