Yosemite changed the path of iOS Simulator.app
Update atom and ignore its compile cache
Merge branch 'master' of https://github.com/holman/dotfiles
Add private environment variable loading
Only loading ~/.env-vars file if exists
Merge pull request #172 from eljojo/patch-1

Only loading ~/.env-vars file if exists
update command to install homebrew
Merge pull request #177 from webmail716/master

update command to install homebrew
Merge remote-tracking branch 'upstream/master'

Conflicts:
	atom.symlink/config.cson
	xcode/aliases.zsh