Hopefully this should make merging upstream easier. Building with NAnt should still work, but Visual Studio is untested.