updates for migration
Merge branch 'targ_rep_combined' of github.com:mpi2/imits into targ_rep_combined

Conflicts:
	db/migrate/20130109114249_set_pheno_type_only_on_mi_plans.rb
	lib/legacy_targ_rep.rb