Pulling Joe's changes
Remove conflict
Remove save file from Python, improve documentation