make linebreak work
Merge branch 'master' of https://github.com/yramagicman/dotfiles

* 'master' of https://github.com/yramagicman/dotfiles:
  blah blah blah
  linebreak actually works!

Conflicts:
	.vimrc
trying to narrow-down a bug in the vim