add time units to course defintion model
resolve conflicts
add required fields to course_def form and adjust specs/factories