whatevs
Merge remote-tracking branch 'upstream/master'

Conflicts:
	plot_graphs.py
	standard_graphs_xy.py
Slides again...
Added some functions; added preliminary script for comparing model and Atlas.
Prelim analysis script... Should clean this up.
Just trying  to make this fucking work
Resolve sid's conflicts (what do I look like, his maid??)
Merge branch 'sidh0-master'