new regime
Merge branch 'master' of https://github.com/nbirnel/dotfiles

Conflicts:
	.bashrc
	.config/bash/distrc/cygwin
	.vim/bundle/vim-colors-solarized
some cleanup from new regime
Merge branch 'master' of https://github.com/nbirnel/dotfiles
Merge branch 'master' of https://github.com/nbirnel/dotfiles
Merge branch 'master' of https://github.com/nbirnel/dotfiles
Merge branch 'master' of https://github.com/nbirnel/dotfiles
lfp.vim colors now work with solarized