Brought in changes during development of NoLifeClient.
Now a submodule to make things easier.

Signed-off-by: retep998 <retep998@verizon.net>