more complete provisioning
Merge branch 'lanehdev' of ssh://github.com/hobson/pug into lanehdev