add go-mode and multi-term settings
update merge