Replace edit script with simple EDITOR setup
Add mtr package (a better traceroute)
No need for empty bundle/config file
Upgrade first, to avoid install errors
Remove deprecated gem options
Add phantomjs
Tweaks recommended by `brew doctor`
No need to worry about CrashPlan anymore
Update our Python toolstack
No need to worry about starting Messages or Skype automatically
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bashrc
	bin/brew-install
	bin/edit
	gemrc
	gitconfig.template