added alias s for cd + ls
Merge branch 'master' of https://github.com/mattmolo/dotfiles