Further cleanup and alignment of Resharper 8.1 project file