Diminish guide-key-mode
Update multiple-cursors
Try out god-mode

https://github.com/chrisdone/god-mode
Fix god-mode / multiple-cursors interaction
Personal: Build some support around god-mode
C-o: open-line-and-indent
Use ido-at-point
Add `ga` ffip keybinding for *.gradle
More tweaks to js2-mode wrapping pairs
Be smarter about function punctuation.
Add ffip-pattern to find all kinds of files
Some magit tweaks
Update dash, expand-region, multiple-cursors, s, tagedit and tern
Private: No longer global god-mode
Merge remote-tracking branch 'upstream/master' into update

Conflicts:
	.mc-lists.el
	site-lisp/dash
	site-lisp/expand-region
	site-lisp/multiple-cursors
	site-lisp/s
	site-lisp/tagedit
	site-lisp/tern