Merge branch 'master' of http://github.com/tungd/dotfiles