Refactored dotfiles. v2
Merge branch 'v2'
Merge branch 'master' into v2