pubspec and nits
Merge branch 'master' into devoncarew_pubspec_updates
Merge pull request #1098 from devoncarew/devoncarew_pubspec_updates

Devoncarew pubspec updates