some flapjack fixes
Merge branch 'master' of https://github.com/lesaux/puppet-flapjack