edit vimrc

add neobundle setting [vimproc]
edit vimrc

add keymap
[company_name] edit vimrc, bashrc

quickrun setting
add tmux.conf, edit vimrc
Merge branch 'company_base' into nk_mac_local

modified:   bashrc
new file:   tmux.conf
modified:   vim/bundle/.neobundle/.netrwhist
modified:   vim/bundle/.neobundle/doc/neobundle.txt
modified:   vim/bundle/.neobundle/install_info
new file:   vim/bundle/YankRing.vim
new file:   vim/bundle/grep.vim
modified:   vim/bundle/neocomplcache
modified:   vim/bundle/neosnippet
new file:   vim/bundle/vim-colors-solarized
modified:   vim/bundle/vim-hybrid
modified:   vim/bundle/vim-quickrun
modified:   vimrc

Conflicts:
	vim/bundle/.neobundle/.netrwhist
	vim/bundle/.neobundle/doc/neobundle.txt
	vim/bundle/.neobundle/install_info
	vim/bundle/neobundle.vim
	vim/bundle/vimshell