Merge branch 'master' of github.com:cboursnell/transrate into cboursnell-master

Conflicts:
	lib/transrate/assembly.rb
	lib/transrate/comparative_metrics.rb
Merge branch 'cboursnell-master'

Conflicts:
	lib/transrate/assembly.rb
	lib/transrate/comparative_metrics.rb