Minor additions
Merge branch 'rebase-branch' of https://github.com/aserrallerios/dotfiles into rebase-branch