working on gordon setup
Merge branch 'master' of github.com:drelu/SAGA-Hadoop

Conflicts:
	hadoop2/bootstrap_hadoop2.py
Merge branch 'master' of github.com:drelu/SAGA-Hadoop

Conflicts:
	hadoop2/bootstrap_hadoop2.py
fix option parser