Salt the earth
Updated black_book to the new hotness
Merge branch 'upgrade-to-rest'