smartparens: turn off sp-autoinsert-quote-if-followed-by-closing-pair
Ignore ELPA
Smarter C-:
Diminish modes from mode-line (http://whattheemacsd.com/init.el-04.html)
Saveplace: save places in files (http://whattheemacsd.com/init.el-03.html)
Update yasnippet, rebind yas-expand to C-c TAB to work around bugs
Update python.el
Only show linum-mode when going-to-line
Tweak magit-mode
Move defaults to a separate file, global-auto-revert-mode for dired
Fixes in python-auto-import
Reorganize .emacs.d into loadable parts
dired-details
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitmodules
	init.el
Always show linum-mode
Theme should be loaded in emacs-site.el