Merge branch 'master' into coge
Merge branch 'coge' of github.com:erbriones/dotfiles into coge