Adding some aliases, updating bloom scripts
Adding magic
Misc: updating scripts
Merge branch 'macbook-bloom' into macbook-air

Conflicts:
	.gitconfig
	.profile