updated dotfiles for ubuntu
Merge branch 'master' of https://github.com/bevacqua/dotfiles