Squashed commit of the following:

commit 10516b03709187917d869eaf97e71ae6c135a644
Author: mwaterous <mark.waterous>
Date:   Tue Apr 8 21:58:48 2014 +0000

    Broke it. Session errors went missing.

commit f3df81678232f9d6ff30b55e09786b649aae9e33
Author: mwaterous <mark.waterous>
Date:   Tue Apr 8 21:42:35 2014 +0000

    Beginning submission segment 2.