Modified doc string
Deleted dead code
Added place holder test
Fixed doc string
Merge branch 'master' of https://github.com/NeuralProsthesisLab/unlock