updates
Merge branch 'master' of github.com:schuang/talk

Conflicts:
	2013-07-15-vcla-mpi.tex