Backup of xan-ubuntu-desktop; (2013-10-13)
Merge branch 'master' of github.com:xanmanning/dotfiles
Tidy