raises-satisfies and raises-violates. Include emacs highlighting.
Merge branch 'master' of https://github.com/brownplt/pyret-lang

Conflicts:
	src/arr/compiler/desugar-check.arr
	src/js/base/pyret-grammar.bnf
	src/js/trove/parse-pyret.js