big changes to classifier.py and Proxy Regression.ipynb
updated classifer.py and merge_data.py slightly