RSync Tool updates
Merge branch 'master' of
git@github.com:kryptick/bubblebathbay_sandbox.git

Conflicts:
	tools/bbbaySync.py
fix from merge issue