A whole ton of fixes.  Sorry, I can't seem to get this to split up cleanly.
Get rid of cucumber