watchjs first round
delete old emits
updating branch
shit.
caching
Merge remote-tracking branch 'origin/master' into watchjs
briefer require of watchjs
Merge remote-tracking branch 'origin/master' into watchjs

Conflicts:
	client/admin.js
	client/common/socket.io.subs.js
	client/index.js
consistent emit convention
Merge pull request #58 from skalnik/watchjs

Watchjs first round