Clearing one more FIXME
Merge branch 'master' of https://github.com/snsokolov/misc

Conflicts:
	server/setup