some linux/osx diffs
Merge branch 'master' of github.com:farfanoide/dotfiles