making additional changes ready for merge
Merge pull request #430 from rackerlabs/constanzeworking16

making additional changes ready for merge