getting ready to merge
Merge branch 'master' of https://github.com/davidmichaelbrown/winemap

name changes
started basic snooth client, got set up for socket.io