Merge pull request #552 from ke-yu/ChocoButter

Merge master to ChocoButter
Update ignore to prevent some settings data from Resharper being committed
Add basic support for handling trace slots
build fixes around RevitServices
DS Node Services test + Bug fix on null data
Merge branch 'ChocoButter' of https://github.com/ikeough/Dynamo into ChocoButter
Addition of residual changes for DS-Revit integration
Attempted build fix - CSProj to use macro locations for RevitAPI
Removal of DEBUG pragmas to make release build work
Merge fix