added yaml mode
Back to basics
Added go-mode
Fixed conflicts