Explicitly load kit base class first
Use lowercase h when requiring hashie
Merge branch 'master' into imager