Uncommented part on installing yamcmcpp library in setup.py
Merge branch 'kelly-dev' of https://github.com/bckelly80/yamcmcpp into kelly-dev

Conflicts:
	yamcmc++/setup.py
Fixed conflicts in setup.py