Updates README

Noticed that Boxen won't run people/manifests/user-name.pp if it
includes dash
Merge branch 'upstream_master'

# By Johan Haals
# Via Johan Haals
* upstream_master:
  Updates README