subl rearranged itself. added gitignore.
Merge branch 'master' of github.com:gak/dotfiles

Conflicts:
	home/.gitconfig