Local commit
Merge branch 'RPyC' of github.com:eugeneai/dispersive into RPyC