fixes
Merge pull request #74 from rackerlabs/flavorfix

This fixes a missing update to Flavor and tests for Flavor