wip
wip
Merge branch 'paper' of /Users/tim/Dropbox/git/sweet.js into paper

Conflicts:
	doc/paper/sweetjs.pdf
	doc/paper/sweetjs.tex
wip