Added auto-correction of simple typos like :Wq --> :wq
Improved prompt colors
Merging the current state from the work machine.
Merge remote-tracking branch 'origin'

Conflicts:
	bashrc
	vimrc
formatting cleanup