ADD: python script to update user directly from es
Merge remote-tracking branch 'origin/wp' into wp

Conflicts:
	user_cruncher.py