Merge changes from nanoc.ws and implement lists