Minor update for /tmp getting full on worker nodes.

The merge step now uses python_local which is defined only for the headnodes,
this forcing the merge step to happen only on the headnode.
Minor fix
merge before pull
Merge branch 'master' of https://github.com/yadudoc/swift-1

Conflicts:
	hadoop_coasters/coaster-service.logs
	hadoop_coasters/sites.xml
	hadoop_coasters/start_hadoop_workers.sh
	knowledge.kml
	knowledge.swift
	knowledge.swiftx
	run-swift.sh