sorting .gitconfig
Updating bloom profile
changing gradle options
Merge branch 'macbook-bloom' into macbook-air

Conflicts:
	.gitconfig
	.profile