A big commit as I was forced to switch to .NET 4.0 as I could not make use of DapperExtensions which triggegered a cascade of things like cleanup and refactoring.