updates to dotfiles
Merge branch 'master' of ssh://github.com/bmbernie/dotfiles