Enable highlight-parentheses mode when erlang-mode is enabled
Merge remote-tracking branch 'github/master'