Pull Master branch updates into EM's SamplingFeatures branch

Performed using text Find Differences tool in TextWrangler code editor.
 Let’s see if this now allows us to auto merge the branches!