Fix the build
Fix the build...again.

Make sure logger still exists when we want to use it by putting a
reference to it on dynSettings. Reverse a previous change to ensure the
EngineController gets constructed.
Merge branch 'master' of https://github.com/DynamoDS/Dynamo

Conflicts:
	src/DynamoCore/Core/DynamoController.cs
	src/DynamoCore/Core/dynSettings.cs