update with upstream changes
update config file to latest upstream
update to latest upstream version
fix for new style for 2.7
migrate away from hiera stuff