Update some yaml syntax for greater flexibility
Update README with new yaml syntax