Remove query duplication
Blacklist develop from travis
Merge develop into master