Corrected client binary output and updated ignore
Merge branch 'master' into clientdebugger

Conflicts:
	.gitignore