Lots of changes.
Merge branch 'master' of http://github.com/lucjon/dotfiles
Remove redundant defaults.nh