Added linewrapping to vim
Merge branch 'master' of https://github.com/zachbornheimer/df

Conflicts:
	.vimrc
Merge branch 'master' of https://github.com/zachbornheimer/df