Update rubygems to use https
Add python's anaconda
Merge branch 'master' of github.com:hector/dotfiles

Conflicts:
	python.sh
Update iterm2 preferences
Update .gitconfig with new email and to work with DiffMerge