Update rakefile.
Merge branch 'master' of github.com:ualbertalib/nyssa

Conflicts:
	Rakefile
	data_scripts/spec/solr.xml