local changes
Merge branch 'master' of ssh://github.com/travisdesell/tao

Conflicts:
	mpi/master_worker.cxx
Merge branch 'master' of ssh://github.com/travisdesell/tao
Added multi-gpu code