Update gitignore
Merge branch 'master' of github.com:samcday/dotfiles

Conflicts:
	git/gitignore.symlink
Merge branch 'master' of github.com:samcday/dotfiles
Updates to Brewfile and atlassian.pac