Ensure all options are included in /proc/mounts.  Some cleanup.
Signed-off-by: NSage Weil <sage@newdream.net>