switch to neutron for havana
Merge pull request #173 from cbaesema/master

switch to neutron for havana
Move to three config files to support global params

Remove the merging of multiple files for user.yaml,
and add the ability to specify global config that
is used for interpolation by the hiera data.