Merge pull request #1 from OpenROV/master

Syncing backup with Master
fixed #197; motor_diags
additional ignore in scrutinizer
fixed #197; photocapture.js
Additional cleanup for #197
Merge pull request #200 from BrianAdams/issue197

Issue197