added tbone
natural changes
solved the merge
github colors!
new commits!
apparently I made changes
Merge remote-tracking branch 'origin/osx' into linux

Conflicts:
	gitconfig
	profile
	vim/.netrwhist
	vimrc
	zsh-update
added a bash prompt