Combine after-load blocks
Only enable js2-mode's syntax checking if flycheck can't do it
More robust code for disabling js2 syntax checks when flycheck is active
Disable session.el in git-commit-mode, to avoid spurious point placement
Enable dired-dwim-target by default

Conflicts:
	lisp/init-dired.el
Add dired-sort
ag.el => grep.el
Move locate-command to init-grep.el
Widen some columns of the package menu table to avoid truncation
Tidy up code for setting tabulated-list-mode column widths
Fix mistaken hook name
Update init-css.el

"</script>" is wrong!
Conflicts:
	lisp/init-css.el
Make standard OS X "Hide Others" keystroke work

Conflicts:
	lisp/init-osx-keys.el