Devel

Merging a whole load of stuff including working verison of packaged based 3.3.0 playbook.