Use stripe-buffer
Prefer built-in show-paren-mode to mic-paren

In Emacs HEAD, the former works beautifully with SMIE to highlight
blocks, e.g. begin / end blocks in Ruby.
Add note about how to add your own customization

Closes #146
Provide a useful binding of C-c C-z in sql-mode
Use highlight-symbol-mode in html mode too
Save more variables in desktop session file
Merge remote-tracking branch 'refs/remotes/purcell/master'

Conflicts:
	init-sql.el
Use multi-web mode to aid editing inline HTML in JSX
Use the default regex-tool backend
s/nrepl/cider
Minor change