Removing conflicts from CHANGES.txt
Merge pull request #424 from nunit/issue-changes-conflict

Removing conflicts from CHANGES.txt
Starting to lay out the WiX installer

Added the license
The filename of the MSI will now automatically have the correct version number
Added features for each version of the framework

The install is nearly complete, it just needs some cleaning up
Split the installer into a tools installer and a framework installer

Cleaned up the features and ensure the dual installers work together