Committing everything one last time before I leave
Preperation for code that does everything at once
Files used to generate data and plot figures all at once
Update .gitignore to include .nfs files.
Merge branch 'master' into mira

Conflicts:
	.gitignore
	plotting_speed.py
	polyxtal.py
	profiling_functions.py
Merge pull request #2 from mlholford/master

Create a master script for generating figures.