sf directories
remove submodules
add -ny submodules
Merge branch 'master' into san-francisco

Conflicts:
	.gitmodules
	searches-ny
Merge branch 'master' of github.com:tlevine/intherooms

Conflicts:
	locations
	meetings
	searches-ny