new file:   exp/diffumicro.py
	renamed:    exp/diffundere-micro-plot.py -> exp/diffumicroplot.py
	new file:   exp/diffumicroproc.py
	deleted:    exp/diffundere-micro.py
	modified:   src/diffundere/src/mapred/org/apache/hadoop/mapred/Task.java
	modified:   src/diffundere/src/mapred/org/apache/hadoop/mapred/diffundere/AlwaysCacheDecider.java
Merge branch 'master' of github.com:cutefish/MRLocality

Conflicts:
	exp/diffundere-micro.py

	modified:   bin/copy-conf.sh
	modified:   bin/easy-setup.sh
	modified:   bin/hadoop-setup.py
	modified:   exp/diffumicro.py
	modified:   exp/diffumicroplot.py
	modified:   exp/diffundere-micro-template.xml
	modified:   src/diffundere/src/mapred/org/apache/hadoop/mapred/JobInProgress.java