Merge pull request #1 from brint/master

Adding mysql root password to hidden outputs
abbreviate flavor name
Merge pull request #2 from JasonBoyles/jgb-abbrev-flavor

abbreviate flavor name