Require ob-org and ob-R

Require org-babel functions for org and R.
Do not make cdlatex simplify braces
Tweak smartparens for displays in org-mode

Still have to figure out how to put point in the correct row
Upstream org changes