Cleaned up the server a bit, also had an epiphany on Conduits and ResourceT. practicing merging new branches to master