.gitignore our secretz fielzgit add .gitignore
Merge branch 'osx' of github.com:alias1/dotfiles into osx

Pull updates from Github
Update bash stuff