Removing specific-query related code
Merge branch 'dev' of https://github.com/iPlantCollaborativeOpenSource/Donkey into dev