refreshing dotfiles for better osx/linux support
merging with most recent HEAD