Remove validates-timeliness plugin (using gem instead)
Annotate models; remove unnecessary plugins
Merge branch 'r3_upgrade' of https://github.com/suegrimes/seqLIMS.git into r3_upgrade_sue

Conflicts:
	Gemfile.lock
Merge branch 'r3_upgrade' of https://github.com/suegrimes/seqLIMS.git into r3_upgrade_sue
Update model annotation
Merge branch 'r3_upgrade_sue' into r3_upgrade

Conflicts:
	app/models/processed_sample.rb
	app/models/sample.rb