custom formatting in init.el.
Merge branch 'master' of github.com:sandinmyjoints/.emacs.d

Conflicts:
	init.el
Update TODO.
New defun search-npm.