Deleted some lines that had been commented out
Changes from dev
Merge branch 'matrix_test' of https://github.com/agnwinds/python into matrix_test

Setup of local branch for matrix_test
Modified Makefile to compile py_wind