Bug 1012855 - Files are being written with corrupt data.

Bug 1012855 - Further review feedback.

Fix indentation.
Bug 1018233 - Get Negatus to work with Mac OS X.
Merge branch 'master' of github.com:sydvicious/Negatus

Conflicts:
	src/CommandEventHandler.cpp
	src/Shell.cpp