ubuntu changes
Merge branch 'master' of github.com:wmak/dotfiles
Merge branch 'master' of github.com:wmak/dotfiles