Merge pull request #7 from brint/master

Updated labels and parameters
abbreviate flavor name
Merge pull request #8 from JasonBoyles/jgb-abbrev-flavor

abbreviate flavor name