More orgmode updates
Merge branch 'master' of ssh://github.com/andyoakley/dotfiles