Refactor Message 1 parsing to mesh better with Message 31.
Fix a few issues with Message 31 parsing.

Rename an attribute to be shorter but still clear and mesh with Message
1. Also make sure we strip the variable names so that we can look up by
'SW' without the space. Also make sure we store the scaled values.