Merge pull request #3 from rlguarino/dev

Merged dev into master
Merge branch 'master' of https://github.com/rlguarino/dotfiles into dev