Trying to apply all Firmwater LMS version changes in one swoop.
Fixed tabs/spaces.  Removed our 'tab out' code since it is now included.