Merge file changes from bounded
Exception overhaul for files
Merge branch 'master' into bounded

Conflicts:
	util/file.cc