1.6.0

Intermediate commit and beginning of bourbon integration