Square away align, clean up
 - drop which_script tests
 - square away align.py