Update from laptop.
Merge branch 'master' of github.com:batandwa/dotfiles

Conflicts:
	.gitconfig