comment out wrangler
Merge branch 'master' of github.com:pzel/.emacs.d

Conflicts:
	init.el
some shortcuts