hollie/misterhouse — pull request #410 by krkeegan (2014-05-15 16:19:56+00:00)
Title: Instoen: Fix a Few Bugs Identified by Jared

Fixes issues identified in discussion on a9bae32 and 6c1f32a