Add some bundles
Add username for GitHub magic
Gib some vim magic
Pulled down update to oh-my-zsh
Merge branch 'master' of github.com:Quintasan/conf

Conflicts:
	.vimrc.last