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

Conflicts:
	.bashrc
	.config/bash/distrc/cygwin
	.config/bash/distrc/freebsd
	.config/bash/distrc/mingw
	.config/bash/osrc/linux
	.config/gitp/dot/info/exclude
	.config/vim/machines/SEA-BIRNEL03.vim
	.config/vim/machines/SEA-NBIRNEL01.vim
	.config/vim/machines/noah-birnels-imac.local.vim
	.config/vim/machines/sea-noah02.vim
	.minttyrc
	.screenrc
	.vim/bundle/PlainText/plugin/PlainText.vim
	.vim/bundle/vim-colors-solarized
	.vim/syntax/lfp.vim
	.vimrc
	.xinitrc
Merge branch 'master' of http://github.com/nbirnel/dotfiles

Conflicts:
	.vim/bundle/solarized
firefox profile alias os x