Add custom installation dir.
Misc fixes.
Add tern.
Merge branch 'master' of github.com:kimgronqvist/.emacs.d

Conflicts:
	user-custom/setup-shell.el