nderwin/lee7 — pull request #1 by nderwin (2014-04-15 02:06:48+00:00)
Title: Server bits

Merge in the initial server bits changes