Add my osx terminal configurations
merge