Updating git aliases to not be wrong.
Fixing line endings of vim config.
Merge branch 'master' of github.com:Tzrlk/dotfiles

Conflicts:
	git/gitconfig