I seem to be having git/dropbox conflicts.  I had to fix the transformations.py file.