add colorschemes
use hybrid colorscheme in vim
Merge branch 'master' of github.com:nwallace/dotfiles

Conflicts:
	new_box.sh
add endwise and surround to vim bundles
move shell scripts to bin and symlink in new_box
fix bug in update_vim_bundles