Several fixes for OSX
Merge branch 'master' of github.com:jmgpena/dotfiles
Changes made in windows side...
Darwin specific changes