Updates to bashrc, scripts, and dictionary.

Fix prompt in bashrc, add seconds to hours, minutes seconds script,
updates to vim dictionary.
Revert colors in linux
Merge branch 'master' of https://github.com/kprussing/dotfiles

Conflicts:
	bashrc