Updated whiskey from 0.6.x to 0.8.x

All tests still passing