Many changes: new vim plugs, prompt change, bash tweaks, misc
Remove unused plugins
Minor git script update. Minor rails script update. Misc bashrc updates. Minor ir_black update.
Vim color scheme updates. Minor changes to vimrc and git.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	etc/bashrc