made chsh detect the user
Merge branch 'master' of https://github.com/jamesyp/dotfiles

Merged changes from aws