Update for troposphere 0.4.0
Minor format and ordering fixes.