StochSS/stochss — pull request #186 by bbbales2 (2014-07-22 23:50:21+00:00)
Title: Updating all the stuff from master back into develop

The last release went through a weird set of branches that didn't include develop, and now develop is behind.