Merge socket and server start

-- No point in keeping them separate
-- Make sure they play nice with express