Merge branch 'master' into lanehdev
getting virtual boxes provisioned
Merge branch 'lanehdev' of ssh://github.com/hobson/pug into lanehdev