Some updates (lololo)
Merge branch 'master' of github.com:torandi/dotfiles

Conflicts:
	gitconfig