Few Major updates...
tab update
Update some things before seeing about merging updates from work
Merge remote-tracking branch 'origin/work'

Conflicts:
	vim/.gvimrc
	vim/.vimrc
Merge branch 'master' of github.com:JoshAshby/dots into work