moved 5 var STATE_ constants into STATE { ... }
alter formatting of STATE{}
clean up merge conflicts
Merge pull request #724 from msimerson/smtp_client2

smtp_client: moved 5 var STATE_ constants into STATE { ... }