modified:   data_analysis_scripts/get_subspacetime.py
Merge branch 'master' of github.com:ucdavis/CDT

Conflicts:
	2p1-fixed-boundaries/data_analysis_scripts/get_subspacetime.py

	modified:   data_analysis_scripts/average_ensemble.py
	modified:   data_analysis_scripts/extract_action.failed.py
	modified:   data_analysis_scripts/extract_action.sh
	modified:   data_analysis_scripts/get_subspacetime.py
	modified:   data_analysis_scripts/invert_time.py
	modified:   data_analysis_scripts/jonah@login
	modified:   data_analysis_scripts/k3_of_k0.py
	modified:   data_analysis_scripts/make_boundary_conditions.py
	modified:   data_analysis_scripts/make_spacetime_movie.sage.py
	modified:   data_analysis_scripts/make_thermalization_scripts.py
	modified:   data_analysis_scripts/make_thermalization_scripts_initial_final_boundary_pairs.py
	modified:   data_analysis_scripts/map_phase_space_parallelized.py
	modified:   data_analysis_scripts/parallel_processing_tools.py
	modified:   data_analysis_scripts/plot_periodic_data.py
	modified:   data_analysis_scripts/plot_phasemap.py
	modified:   data_analysis_scripts/start_cores.sh
	modified:   data_analysis_scripts/submit_cdt_scripts.sh
	modified:   data_analysis_scripts/submit_scripts.py
	modified:   data_analysis_scripts/testing_file.txt
	modified:   data_analysis_scripts/visualize_spacetime.py
	renamed:    ../3p1_fixed_simplices/simplex.lisp -> ../3p1_fixed/simplex.lisp
	modified:   data_analysis_scripts/get_subspacetime.py