Reverting to mainline, updating to Puppt 3.2.1

Switches puppet-omnibus back to bernd/fpm-cookery and updates Puppet to version 3.2.1