Make settings thread safe.
Minor spacing issue.
Merge branch 'master' into Portable

Conflicts:
	GitCommands/Settings.cs