changing the memory settings for the air
Merge branch 'master' into mdodsworth-air
changing gitconfig email address
Merge branch 'master' into mdodsworth-air
Merge branch 'master' into mdodsworth-air

Conflicts:
	playbooks/files/intellij/idea.vmoptions
adding hbase
Merge branch 'master' into mdodsworth-air
fixing brew update script state reporting