Fixed up some settings in the Rebracer.xml to better reflect the coding standards
Merged from master and resolved conflicts
Re-adding files deleted by the merge
Merge pull request #354 from nunit/editorconfig

Editorconfig and Rebracer.xml