Updated for LBM talk.
Merge branch 'gh-pages' of https://github.com/thoppe/research_pres_macrocharge into gh-pages

Conflicts:
	index.html