Correcting sign in mixed term in Laplacian
Merge remote-tracking branch 'upstream/master'
Merged with Min-Kai's fork.
Merge branch 'master' of https://github.com/wlyra/transitional-disk

Conflicts:
	tex/trapping.tex