Added missing functionality and fixed bugs discovered during Hollow Object testing.
Merge branch 'master' of git://github.com/Netflix/zeno