Merge branch 'export-import-commands' into develop; tidied up Autofac configuration; ran a code reformat.

Conflicts:
	source/OctopusTools/OctopusTools.csproj
	source/OctopusTools/Program.cs