Added stricter validation for Production Type and Zone names.  Compliments #140
Merge remote-tracking branch 'origin/master'