integrated with bash-strap
more incorportation of bash-strap
made the number more subltle
added vim colors, a bit lazy but w/e
Merge branch 'master' of github.com:zingales/bashrcs into linux

Conflicts:
	files/bashrc