Merge commissioning branch into master

I've ran into this problem again and I think we should just merge the two branches as there aren't that many keys to handle.

Closes #2 (closed)