Backup of xan-ubuntu-desktop; (2014-01-05)
Merge branch 'master' of github.com:xanmanning/dotfiles