remove scroll-bar-mode.
Merge branch 'master' of https://github.com/riethmayer/emacs

Conflicts:
	init.el