Remove hostname from forest names to address issue #149
Finish fix for # 149
Merge branch 'eedeebee-issue-149' into dev