added GitGutter and Terminal plugins and tweeked some settings
fixed conflict