added settings
Merge branch 'master' of https://github.com/stevleibelt/shell_config