Merge pull request #575 from joshimhoff/master

Adjusts scripts and cmake stuff for the lab
New camera params for the lab
Merge branch 'master' of git://github.com/northern-bites/nbites