add w3m and ipython settings.
Merge branch 'master' of https://github.com/hiroshi-umemoto/dotfiles

Conflicts:
	.emacs.d/init.el