cardboardize
bump cardboard dependency
make sure we have a libdir to work with
Merge branch 'master' into re-integrate

* master:
  make sure we have a libdir to work with
  bump cardboard dependency
  cardboardize

Conflicts:
	manifests/init.pp