Re-organized client.py methods
Merge branch 'dev' of https://github.com/savi-bcrl/aurora into dev