upgrade rails to 3.0.18
add phenotype_only to mi_plan && validation on mi_attempts
fix phenotype_only validation on mi_attempt
add phenotype_only to reports
rejig the belongs_to_mi_plan validations to more easily validate against mi_plan
upgrade rails to 3.0.19
Re-generate assets
explicitly define gem versions
Merge remote-tracking branch 'origin/staging' into targ_rep_combined

Conflicts:
	Gemfile
	Gemfile.lock
	public/assets/extjs_autodep.js
upgrade test-unit. seems to cause issues with newer rails versions