temporary changes to gemfile
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile
Merge branch 'master' of https://github.com/SpeciesFileGroup/taxonworks
Merge remote-tracking branch 'origin/master'
updated ranks for ICZN
Merge remote-tracking branch 'origin/master'
fixed problems with specs