Did all of Bruno's changes from Nov 14 meeting

also renamed actionstory.py to actionsquirrel.py