Pull FROM burke develop TO jeffbayes master.

Trying to get the revamped code.