press enter in command mode in vim to add a new line
Merge branch 'master' of github.com:justbuchanan/dotfiles

Conflicts:
	vimrc