Break lines to fit in 80 chars
Make BOSH `wait` parameter configurable
Add update_userspec for easy overriding single user options