ruby: this should be a list of modes, not hooks

  recommended by ddoherty03
disable IPython support, it is broken
remove this, ipython support now subsumed by python.el

  I should have just merged pajmullaney's patch to begin with.
load Org from source if ORG_HOME env variable set

  If the user has defined the ORG_HOME environment variable, then we
  assume both that the user has installed Org-mode from source, and that
  this variable points to the base of the Org-mode install.  In this
  case we add the value of ORG_HOME to the load path, and load up
  Org-mode immediately.
Dont install magit by elpa: I use mine
Merge remote-tracking branch 'refs/remotes/mainline/master' into my-change

Conflicts:
	init.el