Some nice fixes
Merge branch 'master' of github:/baabelfish/dotfiles