alias for git merge
add syntax highlighting for coffee script