Changed org-mode settings and added octave and magit settings.