toggle-fullscreen
disable tuareg, yasnippet
update
update
update
Merge branch 'master' of https://github.com/nishio/setup

Conflicts:
	dot.emacs.el