Change Stacklife to Bookshelf
Fix git failures