Big cleanup. More use of hiera. Added a few spec tests