roolback
Merge branch 'master' of https://github.com/zpatrick/Takeoff

Conflicts:

	Takeoff/Takeoff.Tests/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Takeoff/Takeoff/bin/Takeoff.dll
	Takeoff/Takeoff/bin/Takeoff.pdb
	Takeoff/Takeoff/obj/Debug/Takeoff.csproj.FileListAbsolute.txt
	Takeoff/Takeoff/obj/Debug/Takeoff.csprojResolveAssemblyReference.cache
	Takeoff/Takeoff/obj/Debug/Takeoff.dll
	Takeoff/Takeoff/obj/Debug/Takeoff.pdb