fixes #3709 - explicitly say puppet environments vs just 'environments'

Fixes #565 - rake puppet:import:puppet_classes misses some changes

Signed-off-by: Paul Kelly <paul.ian.kelly@googlemail.com>

realigned models to use :though and habtm when it made sense, setup basic AS controllers to support that