72
Merge branch 'master' of http://github.com/dfm/bart

Conflicts:
	examples/mpi/run.py
Merge branch 'master' of http://github.com/dfm/bart
Merge branch 'master' of http://github.com/dfm/bart
Merge branch 'master' of http://github.com/dfm/bart
small unimportant changes on server
Merge branch 'master' of http://github.com/dfm/bart
Merge branch 'master' of http://github.com/dfm/bart