Some logic in merge did not make sense.
That's what I get for coding when I cant sleep while I have a fever.
Merge branch 'master' of https://github.com/josephcopenhaver/VNCServer

Conflicts:
	src/com/jcope/vnc/client/StateMachine.java