Finished rmdir.
Merge branch 'brownyoda' into cevans

Conflicts:
	util.c