Updated bundles
Updated gitconfig
New aliases
Merge branch 'master' of github.com:bilalq/dotfiles

Conflicts:
	.gitmodules