Cleanup Windows 2012 template wip
Changes to accomodate windows 2008 r2 wip