Clean up plugin logic and warning text

added a test
Merge pull request #126 from heroku/schneems/plugin-warnings

Clean up plugin logic and warning text