Misc improvements to make lettuce testing a bit saner
Merge pull request #491 from edx/lettuce-improvements

Misc improvements to make lettuce testing a bit saner