Clean up ambiguity between file and filename.
Merge branch 'update-shell' into 2013-04-uwmadison