updated settings and aliases
Merge branch 'master' of https://github.com/stevebosworth/.oh-my-dotfiles