Merge pull request #576 from joshimhoff/master

New camera params for the lab
More cmake defaults