updated gollum lib
removed grit monkey patch
fixed some specs. Resulting from the gollum lib upgrade