Merged latest motech-scm with JSS puppet modules