Merge branch 'refactor_sacrifices'
authorCorin Buchanan-Howland <corin@buchananhowland.net>
Mon, 27 Oct 2014 20:28:36 +0000 (16:28 -0400)
committerCorin Buchanan-Howland <corin@buchananhowland.net>
Mon, 27 Oct 2014 20:28:36 +0000 (16:28 -0400)

Trivial merge