added octave things
Merge branch 'master' of github.com:frrad/dotfiles

Conflicts:
	emacs/.emacs.d/init.el

resolved octave / godoc conflict