adds statusline
Merge branch 'master' of https://github.com/jcsaaddupuy/dotfiles

Conflicts:
	.gitmodules