Merge changes from my RBM development to RBM-reservoir develop branch

I have been developing RBM-reservoir from Yixin's RBM (which isn't linked to UW-Hydro/RBM), so I need to pull changes from current UW-Hydro/RBM, put my current files into that directory, push changes to my GitHub, then do a pull requestion to RBM-reservoir develop branch