Deleting files that are probably leftovers from an earlier merge and conflict
Updating pan pot~ module for 0.6, this was only halfway done from beforehand