Queries
Merge branch 'master' of github.com:mistercrunch/Airflow

Conflicts:
	airflow/www/app.py
Fixing HiveHook to be picklable