Packer; no git proxy.
Merge branch 'master' of github.com:helior/dotfiles

* 'master' of github.com:helior/dotfiles:
  Added packages to package.json – even if I can't install them locally.
  Added Gemfile for Ruby stuff; package.json for Node stuff; difftool and alias changes in gitconfig
  Comment out a lot of cask installs; mamp paths; ethon device name change.

Conflicts:
	git/gitconfig.symlink