ido-ubiquitous mode
Fix c-mode indentation
Bind M-RET in C-based modes to insert a block, preventing the need to juggle around smartparens
More fixes in c-modes
Add the 's' library
Remove smartparens, replace with wrap-region
Update expand-region and python.el
Display fixes
Merge branch 'master' of github.com:vmalloc/emacs
Merge branch 'master' of github.com:vmalloc/emacs

Conflicts:
	.gitmodules