Use different token/serial files for dev & hack modes
Merge branch 'develop' of github.com:ninjablocks/client into develop