Risky unsynchronized update of binary, none mergable file.

Giang has the mutex.  But it's 4 am in Vietnam - and he didn't get the
mutex until after he was offline already.

Fixed a few english things.  Rushed to get this out before the data
collection meeting.

Added new catagories.
Merge branch 'master' of github.com:NeuralProsthesisLab/unlock