Allow override of webdir

ALso updates some puppet3 deprecations
Merge pull request #116 from GregSutcliffe/master

Allow override of webdir