Allow override of webdir

ALso updates some puppet3 deprecations