Made matching braces more visible.
Fixed conflict.
Made changes based on NJ's feedback.
Merge branch 'master' of https://github.com/adobe/brackets into larz/matching-braces-color
Tweaked matching brackets color.
Cleaned up whitespace.
Merge pull request #5034 from adobe/larz/matching-braces-color

Made matching braces more visible.