merger commit - needs more testing
merger commit - needs more testing

BerkeleyAutomation/rlpy,imanolarrieta/RL,rlpy/rlpy,MDPvis/rlpy,rlpy/rlpy,imanolarrieta/RL,silgon/rlpy,BerkeleyAutomation/rlpy,BerkeleyAutomation/rlpy,imanolarrieta/RL,MDPvis/rlpy,rlpy/rlpy,MDPvis/rlpy,silgon/rlpy,silgon/rlpy