Fix function names.
Snapshot.
Tidied.
Merge branch 'master' of github.com:AndyA/dotfiles