improved puppet re-configuration, added Ubuntu 14.04 support