fixes #316
Merge branch 'master' of https://github.com/18F/mirage
Merge pull request #318 from kaitlin/master

Fix for #316