forgot a couple things in 4d85a5435bf0a6f5604df3191bb540e754e091fe
Merge branch 'master' of https://github.com/stan-dev/stan