Updated for ubuntu desktop use
Merge branch 'master' of git://github.com/marcusramberg/dotfiles
Merged