Formatting, plus schema fix

Changed tabs to spaces in a few files.  Also fixed an issue where the
default user ID didn't match the corresponding ID in the password table.