Merge pull request #7 from brint/master

Label and parameter updates
Updating for berkshelf 3
Merge pull request #8 from brint/repo_update

Updating for berkshelf 3
abbreviate flavor name
Merge pull request #9 from JasonBoyles/jgb-abbrev-flavor

abbreviate flavor name