local initial
Merge branch 'master' of https://github.com/nbirnel/dotfiles

Conflicts:
	.bashrc
	.config/bash/distrc/cygwin
	.config/bash/distrc/freebsd
	.vim/bundle/vim-colors-solarized
	.vim/doc/tags
	.xinitrc
no more .vim/doc/tags
junk