Tidied.
Add SAVEOPT, NOLOAD options.
Merge branch 'master' of github.com:AndyA/dotfiles