bwright/acceptance — pull request #16 by tetrakai (2012-05-14 09:55:51+00:00)
Title: Fixed Basilica test

I have no idea what git even did. Sorry if these have conflicts :-/

I did fix the Basilica error though :)