Merge branch 'master' into Jake

Conflicts:
latex/balloonpaper4.pdf