Throwaway pre-merge commit with keyboard mapped controls
Merge branch 'master' of https://github.com/IanPudney/proton

Conflicts:
	DerekWork/Assembly-CSharp-vs.csproj
	DerekWork/Assembly-CSharp.csproj
	DerekWork/DerekWork-csharp.sln
	DerekWork/DerekWork.sln
	DerekWork/DerekWork.userprefs
	DerekWork/Library/CurrentLayout.dwlt
	DerekWork/Library/InspectorExpandedItems.asset
	DerekWork/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	DerekWork/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	DerekWork/Library/ScriptAssemblies/Assembly-CSharp.dll
	DerekWork/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	DerekWork/Library/assetDatabase3
	DerekWork/Library/expandedItems
	DerekWork/Library/guidmapper
	DerekWork/Library/shadercompiler-1.log
Fixed firing mode