peace out, sublime (closes #150)
Skip symlink if the existing symlink links to the same destination
Merge pull request #154 from sibartlett/skip-symlink

Skip symlink - if the existing symlink links to the same destination
--no-ri --no-rdoc is deprecated, use --no-document

/ruby/gemrc.symlink :
this congifuration was using 'gem: --no-ri --no-rdoc' to avoid
installation of docs with gems, but this method is now deprecated
changed it to new official way => 'gem: --no-document'
Merge pull request #157 from pravj/update-gemrc

--no-ri --no-rdoc is deprecated, use --no-document
Removed deprecated bulk_threshold-instance method

http://www.rubydoc.info/github/rubygems/rubygems/Gem/ConfigFile#bulk_threshold-instance_method
Merge pull request #168 from jeffwidman/patch-1

Removed deprecated bulk_threshold-instance method
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
script/bootstrap: be more explicit about what is being overwritten
update command to install homebrew
Merge pull request #177 from webmail716/master

update command to install homebrew
Merge pull request #173 from tobygale/explicit-bootstrap

script/bootstrap: be more explicit about what is being overwritten
Merge branch 'master' of https://github.com/holman/dotfiles

Conflicts:
	.gitignore
	atom.symlink/config.cson
	homebrew/install.sh
	ruby/gemrc.symlink
	xcode/aliases.zsh