Basic setup is done, just gotta build socket.io bit
Use bower to pull in deps.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore