cleaned up the arg parsing for !api commands
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	sandbox.js