renamed scratch variables to be more informative
adding support for if-then-else indentation and highlighting
updating CodeMirror to include if-then-else indentation too
Merge branch 'master' of github.com:brownplt/pyret-lang