more updates to userbase scripts
Merge branch 'master' of https://github.com/devoid/magellan_tools

Conflicts:
	scripts/magellan_user.py