cron job to remove processed files to free up processing space in /tmp fixes #9604
Solr rake tasks and cronjob
Added Capistrano task to regenerate sitemap.xml on deployment
Added sitemap:ping to capistrano deploy
Change it to alert once when there is no flash fixes #9570
Allowing the users to see the batch edit and collection buttons but no the delete buttons on screens other than my files fixes #9595
Adding a timeout to the derivative executable running so soffice does not hang.  fixes #9607
Removing puts and adding time in words to make the error output better.  refs #9607
Changing the timeout to 10 minutes and changing how we are calling time_ago_in_words
Added role so that it applies to all servers refs #9604
Merge branch 'release-2.0.5' into develop

Conflicts:
	config/schedule.rb
Adding a rake task to parse a user's inbox and reconstruct the batches based on message.  refs #9626
Modifying resque pool configureations to use less memory. refs #9624
Adding close and unlink to delete the temp file after use
filtering characterization to be for files smaller than 1G.  refs #9624
loading show from solr so it does not hang on very large file
Removing resque-pool.yml from ss1... so that the jobs do not run on the solr machine
Upgrading to the latest sufia and combining some feature tests for speed
Removing overrides in ScholarSphere now that they are a part of Sufia.  fixes #9592 fixes #9591 fixes #9589
removing local reference to active-fedora