[hadoop scheduler] switching between schedulers using hadoop_scheduler config parameter
Merge branch 'master' of https://github.com/kawaa/luigi

Conflicts:
	luigi/hadoop.py
	luigi/hive.py