Ok, gotcha! I merged this pull request in, as it seemed to be working!

Could you, on ocassion pull create a new pull request without the MA_CLOUD4ALL_USER block, and without the types in each of the settings? Just so everything is nice and clean