Fix: trailing whitespace
Fix: opsworks replaces "-" with "_"

cc @naderman