Updating from Ubuntu
Merge branch 'master' of https://github.com/bsima/dotfiles