hopefully fix git...
Merge branch 'master' of github.com:icco/dotFiles