Wiping everything clean

Preparing for a merge from master.