Fixed typos in rbm.py and added functionality to makemachine.py
Fixed merge conflict