Latest changes.

Comment out smartparens, I didn't like it.