delete tokens after use, saves some longer term memory

Conflicts:
	salt/master.py
Fix bad ref to load